diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-05-07 17:15:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 17:15:21 -0700 |
| commit | 63f7f5cda5481f613cf4fc32bf3c3531d731fa59 (patch) | |
| tree | ade627b1da39da193826407c616ad7ddd5f87ca2 /src/com | |
| parent | 2bcca59f30a69b862808a5778fb1f07909b747d9 (diff) | |
| parent | 8f5463dd17f762e332ac5a76f258532e9dd61abb (diff) | |
| download | packages_apps_settings-63f7f5cda5481f613cf4fc32bf3c3531d731fa59.zip packages_apps_settings-63f7f5cda5481f613cf4fc32bf3c3531d731fa59.tar.gz packages_apps_settings-63f7f5cda5481f613cf4fc32bf3c3531d731fa59.tar.bz2 | |
Merge "Remove poor connection UI with watchdog disabled" into jb-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/AdvancedWifiSettings.java | 12 |
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); |