diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-05-31 12:22:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-31 12:22:30 -0700 |
| commit | 5388bc88bdf045a461c52856e9bc2de9f1664acf (patch) | |
| tree | dfc8a1eca9f3489825a47db2f6af763ed0a38adf /src/com/android/settings/wifi | |
| parent | c9bd848b11c126642ec20c67cc03908f1f445bec (diff) | |
| parent | f0780a7cad2bb8f430d5766115f7f9f50698cfb3 (diff) | |
| download | packages_apps_Settings-5388bc88bdf045a461c52856e9bc2de9f1664acf.zip packages_apps_Settings-5388bc88bdf045a461c52856e9bc2de9f1664acf.tar.gz packages_apps_Settings-5388bc88bdf045a461c52856e9bc2de9f1664acf.tar.bz2 | |
Merge "Fix poor network detection setting" into jb-dev
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/AdvancedWifiSettings.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index d8a4080..bb50d2a 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -43,7 +43,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment private static final String KEY_FREQUENCY_BAND = "frequency_band"; private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks"; private static final String KEY_SLEEP_POLICY = "sleep_policy"; - private static final String KEY_ENABLE_WIFI_WATCHDOG = "wifi_enable_watchdog_service"; + private static final String KEY_POOR_NETWORK_DETECTION = "wifi_poor_network_detection"; private WifiManager mWifiManager; @@ -73,16 +73,14 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1); notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled()); - boolean watchdogEnabled = Secure.getInt(getContentResolver(), - Secure.WIFI_WATCHDOG_ON, 1) != 0; - CheckBoxPreference watchdog = - (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG); - if (watchdog != null) { - if (watchdogEnabled) { - watchdog.setChecked(Secure.getInt(getContentResolver(), - Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); + CheckBoxPreference poorNetworkDetection = + (CheckBoxPreference) findPreference(KEY_POOR_NETWORK_DETECTION); + if (poorNetworkDetection != null) { + if (Utils.isWifiOnly(getActivity())) { + getPreferenceScreen().removePreference(poorNetworkDetection); } else { - getPreferenceScreen().removePreference(watchdog); + poorNetworkDetection.setChecked(Secure.getInt(getContentResolver(), + Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); } } @@ -146,7 +144,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment Secure.putInt(getContentResolver(), Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); - } else if (KEY_ENABLE_WIFI_WATCHDOG.equals(key)) { + } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) { Secure.putInt(getContentResolver(), Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); |