diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-07-29 23:25:10 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-07-29 23:53:44 -0700 |
| commit | 83bcc98af19597a213a8d174e8f1b47453d513ce (patch) | |
| tree | c1898d10bcaf0720ea5e2566365128e641faca18 /res/xml | |
| parent | f0484951fbff3f34407584b73b45f7f75cb4c989 (diff) | |
| download | packages_apps_settings-83bcc98af19597a213a8d174e8f1b47453d513ce.zip packages_apps_settings-83bcc98af19597a213a8d174e8f1b47453d513ce.tar.gz packages_apps_settings-83bcc98af19597a213a8d174e8f1b47453d513ce.tar.bz2 | |
Allow enabling Wifi when in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.
We also allow access to the VPN settings under the same circumstances.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/wireless_settings.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 4731fb3..de62687 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -22,13 +22,12 @@ android:key="toggle_wifi" android:title="@string/wifi_quick_toggle_title" android:summary="@string/wifi_quick_toggle_summary" - android:persistent="false" - android:dependency="toggle_airplane" /> + android:persistent="false" /> <PreferenceScreen + android:key="wifi_settings" android:title="@string/wifi_settings" - android:summary="@string/wifi_settings_summary" - android:dependency="toggle_airplane"> + android:summary="@string/wifi_settings_summary" > <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" @@ -53,9 +52,9 @@ </PreferenceScreen> <PreferenceScreen + android:key="vpn_settings" android:title="@string/vpn_settings_title" - android:summary="@string/vpn_settings_summary" - android:dependency="toggle_airplane"> + android:summary="@string/vpn_settings_summary" > <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" |