diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2009-12-01 17:08:20 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2009-12-22 14:35:44 -0800 |
| commit | 1c4e96864f054f0d3d754d21eb4803fe0df6d89f (patch) | |
| tree | 4273bf3a3fbe5ea7b5fcba96cb61a93e80598202 /res/xml | |
| parent | fc34079510d4337df2447985c33eb9b1586e3a04 (diff) | |
| download | packages_apps_settings-1c4e96864f054f0d3d754d21eb4803fe0df6d89f.zip packages_apps_settings-1c4e96864f054f0d3d754d21eb4803fe0df6d89f.tar.gz packages_apps_settings-1c4e96864f054f0d3d754d21eb4803fe0df6d89f.tar.bz2 | |
Allow bluetooth in airplane mode when in "toggleable" list.
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of
radios that can be toggled while in airplane mode. This CL
changes BluetoothEnabler to respect this.
It parallels the logic in WifiEnabler, which enables OEMs
to allow Wifi changes when in airplane mode.
Most existing devices don't include "bluetooth" in the
toggleable list, which means bluetooth will continue to be
disabled when in airplane mode for those devices.
Fixes http://b/2297314
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/wireless_settings.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 1bb55ef..2493021 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -44,14 +44,12 @@ android:key="toggle_bluetooth" android:title="@string/bluetooth_quick_toggle_title" android:summary="@string/bluetooth_quick_toggle_summary" - android:persistent="false" - android:dependency="toggle_airplane" /> + android:persistent="false" /> <PreferenceScreen android:key="bt_settings" android:title="@string/bluetooth_settings_title" - android:summary="@string/bluetooth_settings_summary" - android:dependency="toggle_airplane"> + android:summary="@string/bluetooth_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" |