diff options
author | Robert Greenwalt <robdroid@android.com> | 2011-11-08 10:01:07 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 10:01:07 -0800 |
commit | ea54b7608584bc0535c9e89417778c3e95b50975 (patch) | |
tree | e5753ed7b48afc186d593c8b070558993a1307a4 /packages/SettingsProvider | |
parent | 1366c756d28cdbb6c7c07959dfb4c93c81a9539d (diff) | |
parent | 148c7d0de720a92632aa6ed10a39bfc38b427239 (diff) | |
download | frameworks_base-ea54b7608584bc0535c9e89417778c3e95b50975.zip frameworks_base-ea54b7608584bc0535c9e89417778c3e95b50975.tar.gz frameworks_base-ea54b7608584bc0535c9e89417778c3e95b50975.tar.bz2 |
Merge "Wimax : wimax framework related open source." into ics-mr1
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 03d5bd2..0891525 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -21,7 +21,7 @@ <integer name="def_screen_off_timeout">60000</integer> <bool name="def_airplane_mode_on">false</bool> <!-- Comma-separated list of bluetooth, wifi, and cell. --> - <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi,nfc</string> + <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi,nfc,wimax</string> <string name="airplane_mode_toggleable_radios" translatable="false">bluetooth,wifi,nfc</string> <bool name="def_auto_time">true</bool> <bool name="def_auto_time_zone">true</bool> |