diff options
Diffstat (limited to 'src/com/android/settings/wifi/AdvancedWifiSettings.java')
| -rw-r--r-- | src/com/android/settings/wifi/AdvancedWifiSettings.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index c213512..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,14 +73,15 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1); notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled()); - CheckBoxPreference watchdogEnabled = - (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG); - if (watchdogEnabled != null) { - watchdogEnabled.setChecked(Secure.getInt(getContentResolver(), - Secure.WIFI_WATCHDOG_ON, 1) == 1); - - //TODO: Bring this back after changing watchdog behavior - getPreferenceScreen().removePreference(watchdogEnabled); + CheckBoxPreference poorNetworkDetection = + (CheckBoxPreference) findPreference(KEY_POOR_NETWORK_DETECTION); + if (poorNetworkDetection != null) { + if (Utils.isWifiOnly(getActivity())) { + getPreferenceScreen().removePreference(poorNetworkDetection); + } else { + poorNetworkDetection.setChecked(Secure.getInt(getContentResolver(), + Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); + } } ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); @@ -143,9 +144,9 @@ 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_ON, + Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); } else { return super.onPreferenceTreeClick(screen, preference); |