diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 08:35:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 08:35:41 -0700 |
| commit | 3deea37da311bbe8486ffe48a8b3c8b0f6a0bc60 (patch) | |
| tree | f25a767791fe068f8acd549e8fcc2b81c3c74d2d /res | |
| parent | 4867faafa1390681ee74af21658d2447d3d52596 (diff) | |
| parent | 83bcc98af19597a213a8d174e8f1b47453d513ce (diff) | |
| download | packages_apps_Settings-3deea37da311bbe8486ffe48a8b3c8b0f6a0bc60.zip packages_apps_Settings-3deea37da311bbe8486ffe48a8b3c8b0f6a0bc60.tar.gz packages_apps_Settings-3deea37da311bbe8486ffe48a8b3c8b0f6a0bc60.tar.bz2 | |
Merge change 9116
* changes:
Allow enabling Wifi when in airplane mode.
Diffstat (limited to 'res')
| -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" |