diff options
| author | Jake Hamby <jhamby@google.com> | 2010-08-31 14:45:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 14:45:30 -0700 |
| commit | 2c24516e58c2ac8d166b1866a6b5b2085b4f321e (patch) | |
| tree | bc8f97106f5b7d6e10905657dcb0bf35285f9709 /packages/SettingsProvider/res/values/defaults.xml | |
| parent | eb91e78ff9a13326c6a43c7cdad6ca02fc34389e (diff) | |
| parent | 04bc807057d1c336a5d1340595b790eee4c5b372 (diff) | |
| download | frameworks_base-2c24516e58c2ac8d166b1866a6b5b2085b4f321e.zip frameworks_base-2c24516e58c2ac8d166b1866a6b5b2085b4f321e.tar.gz frameworks_base-2c24516e58c2ac8d166b1866a6b5b2085b4f321e.tar.bz2 | |
am 04bc8070: am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode.
Merge commit '04bc807057d1c336a5d1340595b790eee4c5b372'
* commit '04bc807057d1c336a5d1340595b790eee4c5b372':
Allow Bluetooth radio to be toggled in Airplane mode.
Diffstat (limited to 'packages/SettingsProvider/res/values/defaults.xml')
| -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 fbeaf4f..2ae34e3 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -22,7 +22,7 @@ <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</string> - <string name="airplane_mode_toggleable_radios" translatable="false">wifi</string> + <string name="airplane_mode_toggleable_radios" translatable="false">bluetooth,wifi</string> <bool name="def_auto_time">true</bool> <bool name="def_accelerometer_rotation">true</bool> <!-- Default screen brightness, from 0 to 255. 102 is 40%. --> |