diff options
author | Gilles Debunne <debunne@google.com> | 2011-07-07 18:23:04 -0700 |
---|---|---|
committer | Gilles Debunne <debunne@google.com> | 2011-07-08 10:05:14 -0700 |
commit | dfc2637ebaee6e7467b0340ec652c29f6b5734ff (patch) | |
tree | 7d69d8a69642d8a6687cc184e1d12584e923c70d /res | |
parent | 6dc0f9639e5c566818930fa183e67927a1b761f8 (diff) | |
download | packages_apps_Settings-dfc2637ebaee6e7467b0340ec652c29f6b5734ff.zip packages_apps_Settings-dfc2637ebaee6e7467b0340ec652c29f6b5734ff.tar.gz packages_apps_Settings-dfc2637ebaee6e7467b0340ec652c29f6b5734ff.tar.bz2 |
Removed summary text and categories in Wireless settings
Bug 5002377 and 5002476.
Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 45 | ||||
-rw-r--r-- | res/xml/wireless_settings.xml | 29 |
2 files changed, 7 insertions, 67 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f8d38a2..8f09012 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -339,8 +339,6 @@ <!-- HTTP proxy settings title --> <string name="proxy_settings_title">Proxy settings</string> - <!-- HTTP proxy settings summary --> - <string name="proxy_settings_summary">Set the global HTTP proxy and exclusion lists</string> <!-- HTTP proxy settings. Button to clear the proxy box. --> <string name="proxy_clear_text">Clear</string> <!-- HTTP proxy settings. The port number label. --> @@ -531,12 +529,6 @@ <string name="settings_shortcut">Select settings shortcut</string> <!-- Wireless controls settings screen, setting check box label --> <string name="airplane_mode">Airplane mode</string> - <!-- Wireless controls settings screen, setting option summary text --> - <string name="airplane_mode_summary">Disable all wireless connections</string> - <!-- Wireless controls settings screen, setting option summary text as airplane mode is being enabled (so it is disabling all wireless connections) --> - <string name="airplane_mode_turning_on">Disabling wireless connections\u2026</string> - <!-- Wireless controls settings screen, setting option summary text as airplane mode is being disabled (so it is re-enabling all the wireless conenctions) --> - <string name="airplane_mode_turning_off">Enabling wireless connections\u2026</string> <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN. This will take you to another screen with those settings. --> <string name="radio_controls_title">More\u2026</string> <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. --> @@ -1066,9 +1058,6 @@ <!-- NFC settings --> <!-- Used in the 1st-level settings screen to turn on NFC --> <string name="nfc_quick_toggle_title">NFC</string> - <!-- Used in the 1st-level settings screen as the turn-on summary --> - <string name="nfc_quick_toggle_summary">Use Near Field Communication to read and exchange tags</string> - <string name="nfc_toggle_error" msgid="8998642457947607263">An error occurred.</string> <!-- Wi-Fi Settings --> <skip /> <!-- Used in the 1st-level settings screen to turn on Wi-Fi --> @@ -1910,32 +1899,6 @@ <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]--> <string name="tether_settings_title_all">Tethering & portable hotspot</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings --> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when only USB tethering is available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_usb" product="tablet">Share your tablet\'s mobile data connection via USB</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when only USB tethering is available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_usb" product="default">Share your phone\'s mobile data connection via USB</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_wifi">Share your mobile data connection as a portable Wi-Fi hotspot</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_bluetooth">Share your mobile data connection via Bluetooth</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when USB and Wifi tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_usb_wifi" product="tablet">Share your tablet\'s mobile data connection via USB or as a portable Wi-Fi hotspot</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when USB and Wifi tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_usb_wifi" product="default">Share your phone\'s mobile data connection via USB or as a portable Wi-Fi hotspot</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_usb_bluetooth" product="tablet">Share your tablet\'s mobile data connection via USB or Bluetooth</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_usb_bluetooth" product="default">Share your phone\'s mobile data connection via USB or Bluetooth</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when Bluetooth and Wifi tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_wifi_bluetooth" product="tablet">Share your tablet\'s mobile data connection via Bluetooth or as a portable Wi-Fi hotspot</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when Bluetooth and Wifi tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_wifi_bluetooth" product="default">Share your phone\'s mobile data connection via Bluetooth or as a portable Wi-Fi hotspot</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when USB, Wifi, and Bluetooth tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_all" product="tablet">Share your tablet\'s mobile data connection via USB, Wi-Fi, or Bluetooth</string> - <!-- Tethering controls, the item summary for the user to go into the tethering settings when USB, Wifi, and Bluetooth tethering are available [CHAR LIMIT=100]--> - <string name="tether_settings_summary_all" product="default">Share your phone\'s mobile data connection via USB, Wi-Fi, or Bluetooth</string> - <!-- USB Tethering options --> <string name="usb_title">USB</string> <string name="usb_tethering_button_text">USB tethering</string> @@ -1979,14 +1942,8 @@ <!-- Tethering help button - calls up a web view with general tethering info --> <string name="tethering_help_button_text">Help</string> - <!-- Wireless controls, header for the general category (airplane mode, VPN, NFC, tethering...) [CHAR LIMIT=40]--> - <string name="wireless_category_general">General</string> - <!-- Wireless controls, header for the mobile networks category (4G/ network operator...) [CHAR LIMIT=40]--> - <string name="wireless_category_mobile_networks">Mobile networks</string> <!-- Wireless controls, item title to go into the network settings --> <string name="network_settings_title">Mobile networks</string> - <!-- Wireless controls, the item summary for the user to go into the network settings --> - <string name="network_settings_summary">Set options for roaming, networks, APNs</string> <!-- Security & location settings screen, section header for settings relating to location --> <string name="location_title">My Location</string> @@ -2975,8 +2932,6 @@ found in the list of installed applications.</string> <!-- Title of preference to enter the VPN settings activity --> <string name="vpn_settings_title">VPN settings</string> - <!-- Summary of preference to enter the VPN settings activity --> - <string name="vpn_settings_summary">Set up & manage Virtual Private Networks (VPNs)</string> <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] --> <string name="credentials_title">Credential storage</string> 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> |