summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi/AdvancedWifiSettings.java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-05-07 16:23:09 -0700
committerIrfan Sheriff <isheriff@google.com>2012-05-07 16:53:20 -0700
commit8f5463dd17f762e332ac5a76f258532e9dd61abb (patch)
tree74f4de7eb9053c3b69e0b7e975d785a3b7fe780c /src/com/android/settings/wifi/AdvancedWifiSettings.java
parent31a84c881cc5bcf51baa703a112604ae83d11ceb (diff)
downloadpackages_apps_Settings-8f5463dd17f762e332ac5a76f258532e9dd61abb.zip
packages_apps_Settings-8f5463dd17f762e332ac5a76f258532e9dd61abb.tar.gz
packages_apps_Settings-8f5463dd17f762e332ac5a76f258532e9dd61abb.tar.bz2
Remove poor connection UI with watchdog disabled
Bug: 6449324 Change-Id: I8ddd486ce433b30dd76d385680fdb79d2b90e8eb
Diffstat (limited to 'src/com/android/settings/wifi/AdvancedWifiSettings.java')
-rw-r--r--src/com/android/settings/wifi/AdvancedWifiSettings.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 5d673c4..d8a4080 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -73,11 +73,17 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
- CheckBoxPreference watchdogEnabled =
+ boolean watchdogEnabled = Secure.getInt(getContentResolver(),
+ Secure.WIFI_WATCHDOG_ON, 1) != 0;
+ CheckBoxPreference watchdog =
(CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG);
- if (watchdogEnabled != null) {
- watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),
+ if (watchdog != null) {
+ if (watchdogEnabled) {
+ watchdog.setChecked(Secure.getInt(getContentResolver(),
Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1);
+ } else {
+ getPreferenceScreen().removePreference(watchdog);
+ }
}
ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);