From dfc2637ebaee6e7467b0340ec652c29f6b5734ff Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Thu, 7 Jul 2011 18:23:04 -0700 Subject: [PATCH] Removed summary text and categories in Wireless settings Bug 5002377 and 5002476. Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901 --- res/values/strings.xml | 45 ------------------- res/xml/wireless_settings.xml | 29 +++--------- .../android/settings/AirplaneModeEnabler.java | 11 +---- .../android/settings/WirelessSettings.java | 7 --- src/com/android/settings/nfc/NfcEnabler.java | 6 +-- 5 files changed, 9 insertions(+), 89 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index f8d38a22750..8f09012a798 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -339,8 +339,6 @@ Proxy settings - - Set the global HTTP proxy and exclusion lists Clear @@ -531,12 +529,6 @@ Select settings shortcut Airplane mode - - Disable all wireless connections - - Disabling wireless connections\u2026 - - Enabling wireless connections\u2026 More\u2026 @@ -1066,9 +1058,6 @@ NFC - - Use Near Field Communication to read and exchange tags - An error occurred. @@ -1910,32 +1899,6 @@ Tethering & portable hotspot - - - Share your tablet\'s mobile data connection via USB - - Share your phone\'s mobile data connection via USB - - Share your mobile data connection as a portable Wi-Fi hotspot - - Share your mobile data connection via Bluetooth - - Share your tablet\'s mobile data connection via USB or as a portable Wi-Fi hotspot - - Share your phone\'s mobile data connection via USB or as a portable Wi-Fi hotspot - - Share your tablet\'s mobile data connection via USB or Bluetooth - - Share your phone\'s mobile data connection via USB or Bluetooth - - Share your tablet\'s mobile data connection via Bluetooth or as a portable Wi-Fi hotspot - - Share your phone\'s mobile data connection via Bluetooth or as a portable Wi-Fi hotspot - - Share your tablet\'s mobile data connection via USB, Wi-Fi, or Bluetooth - - Share your phone\'s mobile data connection via USB, Wi-Fi, or Bluetooth - USB USB tethering @@ -1979,14 +1942,8 @@ Help - - General - - Mobile networks Mobile networks - - Set options for roaming, networks, APNs My Location @@ -2975,8 +2932,6 @@ found in the list of installed applications. VPN settings - - Set up & manage Virtual Private Networks (VPNs) Credential storage diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 0488e0297bf..605ddb994eb 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -17,43 +17,30 @@ - - - - - + android:title="@string/vpn_settings_title" /> - + android:title="@string/tether_settings_title_all" /> - + - + android:title="@string/proxy_settings_title" /> diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 00c416fc9ed..94ba5a1d5c6 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -16,8 +16,6 @@ package com.android.settings; -import com.android.internal.telephony.PhoneStateIntentReceiver; - import android.content.Context; import android.content.Intent; import android.database.ContentObserver; @@ -27,8 +25,8 @@ import android.os.SystemProperties; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.provider.Settings; -import android.telephony.ServiceState; +import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener { @@ -93,10 +91,6 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene } private void setAirplaneModeOn(boolean enabling) { - - mCheckBoxPref.setSummary(enabling ? R.string.airplane_mode_turning_on - : R.string.airplane_mode_turning_off); - // Change the system setting Settings.System.putInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, enabling ? 1 : 0); @@ -118,10 +112,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene * - mobile does not send failure notification, fail on timeout. */ private void onAirplaneModeChanged() { - boolean airplaneModeEnabled = isAirplaneModeOn(mContext); mCheckBoxPref.setChecked(isAirplaneModeOn(mContext)); - mCheckBoxPref.setSummary(airplaneModeEnabled ? null : - mContext.getString(R.string.airplane_mode_summary)); } /** diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index d09fcc58f54..5560a03dab5 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -139,25 +139,18 @@ public class WirelessSettings extends SettingsPreferenceFragment { Preference p = findPreference(KEY_TETHER_SETTINGS); if (wifiAvailable && usbAvailable && bluetoothAvailable) { p.setTitle(R.string.tether_settings_title_all); - p.setSummary(R.string.tether_settings_summary_all); } else if (wifiAvailable && usbAvailable) { p.setTitle(R.string.tether_settings_title_all); - p.setSummary(R.string.tether_settings_summary_usb_wifi); } else if (wifiAvailable && bluetoothAvailable) { p.setTitle(R.string.tether_settings_title_all); - p.setSummary(R.string.tether_settings_summary_wifi_bluetooth); } else if (wifiAvailable) { p.setTitle(R.string.tether_settings_title_wifi); - p.setSummary(R.string.tether_settings_summary_wifi); } else if (usbAvailable && bluetoothAvailable) { p.setTitle(R.string.tether_settings_title_usb_bluetooth); - p.setSummary(R.string.tether_settings_summary_usb_bluetooth); } else if (usbAvailable) { p.setTitle(R.string.tether_settings_title_usb); - p.setSummary(R.string.tether_settings_summary_usb); } else { p.setTitle(R.string.tether_settings_title_bluetooth); - p.setSummary(R.string.tether_settings_summary_bluetooth); } } } diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index d1cec134880..dba1329a410 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -16,8 +16,6 @@ package com.android.settings.nfc; -import com.android.settings.R; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -26,7 +24,6 @@ import android.nfc.NfcAdapter; import android.os.Handler; import android.preference.CheckBoxPreference; import android.preference.Preference; -import android.provider.Settings; import android.util.Log; /** @@ -98,6 +95,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { // Start async update of the NFC adapter state, as the API is // unfortunately blocking... new Thread("toggleNFC") { + @Override public void run() { Log.d(TAG, "Setting NFC enabled state to: " + desiredState); boolean success = false; @@ -118,7 +116,6 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { mHandler.post(new Runnable() { public void run() { mCheckbox.setEnabled(true); - mCheckbox.setSummary(R.string.nfc_toggle_error); } }); } @@ -130,6 +127,5 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { private void handleNfcStateChanged(boolean newState) { mCheckbox.setChecked(newState); mCheckbox.setEnabled(true); - mCheckbox.setSummary(R.string.nfc_quick_toggle_summary); } }