From a2f301cc664c0dfa50e9bf8cd99231ec60bf41ff Mon Sep 17 00:00:00 2001 From: Isaac Levy Date: Mon, 27 Jun 2011 15:48:15 -0700 Subject: Add WifiWatchdogService toggle to Wifi Settings Toggle is located in Settings->Wifi Settings->Advanced Wifi Settings Change-Id: I0f8f2b6353842dae0b47dca1dd48994e42505169 --- src/com/android/settings/wifi/AdvancedSettings.java | 13 +++++++++++++ src/com/android/settings/wifi/AdvancedWifiSettings.java | 1 + 2 files changed, 14 insertions(+) (limited to 'src/com/android/settings/wifi') diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java index 4855c99..cd7b8a3 100644 --- a/src/com/android/settings/wifi/AdvancedSettings.java +++ b/src/com/android/settings/wifi/AdvancedSettings.java @@ -43,6 +43,7 @@ public class AdvancedSettings 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 WifiManager mWifiManager; @@ -72,6 +73,13 @@ public class AdvancedSettings extends SettingsPreferenceFragment Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1); notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled()); + CheckBoxPreference watchdogEnabled = + (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG); + watchdogEnabled.setChecked(Secure.getInt(getContentResolver(), + Secure.WIFI_WATCHDOG_ON, 1) == 1); + + watchdogEnabled.setEnabled(mWifiManager.isWifiEnabled()); + ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); if (mWifiManager.isDualBandSupported()) { @@ -111,12 +119,17 @@ public class AdvancedSettings extends SettingsPreferenceFragment Secure.putInt(getContentResolver(), Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); + } else if (KEY_ENABLE_WIFI_WATCHDOG.equals(key)) { + Secure.putInt(getContentResolver(), + Secure.WIFI_WATCHDOG_ON, + ((CheckBoxPreference) preference).isChecked() ? 1 : 0); } else { return super.onPreferenceTreeClick(screen, preference); } return true; } + @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index 1da8b68..bc92b3a 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -76,6 +76,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment } } + @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); if (key == null) return true; -- cgit v1.1