diff options
| author | Gilles Debunne <debunne@google.com> | 2011-07-18 17:46:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-18 17:46:54 -0700 |
| commit | 1840494bdafaf4d95722f25caada8cf28c074f49 (patch) | |
| tree | 85dad2e4c5854294cd5d6e729f93a1bf0714b159 /res/xml | |
| parent | b8370359a7ba9bddb6c71efc78156b7d259c9507 (diff) | |
| parent | dfc2637ebaee6e7467b0340ec652c29f6b5734ff (diff) | |
| download | packages_apps_Settings-1840494bdafaf4d95722f25caada8cf28c074f49.zip packages_apps_Settings-1840494bdafaf4d95722f25caada8cf28c074f49.tar.gz packages_apps_Settings-1840494bdafaf4d95722f25caada8cf28c074f49.tar.bz2 | |
Merge "Removed summary text and categories in Wireless settings"
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/wireless_settings.xml | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 0488e02..605ddb9 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -17,43 +17,30 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/wireless_networks_settings_title"> - <PreferenceCategory - android:title="@string/wireless_category_general" /> - <CheckBoxPreference android:key="toggle_airplane" android:title="@string/airplane_mode" - android:summary="@string/airplane_mode_summary" android:persistent="false" android:disableDependentsState="true" /> - <CheckBoxPreference - android:key="toggle_nfc" - android:title="@string/nfc_quick_toggle_title" - android:summary="@string/nfc_quick_toggle_summary" - android:persistent="false" /> - <PreferenceScreen android:fragment="com.android.settings.vpn2.VpnSettings" android:key="vpn_settings" - android:title="@string/vpn_settings_title" - android:summary="@string/vpn_settings_summary" > - </PreferenceScreen> + android:title="@string/vpn_settings_title" /> <PreferenceScreen android:fragment="com.android.settings.TetherSettings" android:key="tether_settings" - android:title="@string/tether_settings_title_all" - android:summary="@string/tether_settings_summary_all"> - </PreferenceScreen> + android:title="@string/tether_settings_title_all" /> - <PreferenceCategory - android:title="@string/wireless_category_mobile_networks" /> + <CheckBoxPreference + android:key="toggle_nfc" + android:title="@string/nfc_quick_toggle_title" + android:persistent="false" /> <PreferenceScreen android:key="mobile_network_settings" android:title="@string/network_settings_title" - android:summary="@string/network_settings_summary" android:dependency="toggle_airplane"> <intent android:action="android.intent.action.MAIN" @@ -64,8 +51,6 @@ <PreferenceScreen android:fragment="com.android.settings.ProxySelector" android:key="proxy_settings" - android:title="@string/proxy_settings_title" - android:summary="@string/proxy_settings_summary" > - </PreferenceScreen> + android:title="@string/proxy_settings_title" /> </PreferenceScreen> |