PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add WifiWatchdogService toggle to Wifi Settings"

Browse Source
This commit is contained in:
Isaac Levy
2011-06-27 18:30:19 -07:00
committed by Android (Google) Code Review
parent 2b74a839e0 a2f301cc66
commit 5edab9aa08
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1082,6 +1082,10 @@
<string name="wifi_notify_open_networks">Network notification</string>
<!-- Checkbox summary for option to notify user when open networks are nearby -->
<string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string>
<!-- Checkbox title for option to toggle wifi watchdog service -->
<string name="wifi_enable_watchdog_service">Wi-Fi Connectivity Checks</string>
<!-- Checkbox summary for option to toggle wifi watchdog service -->
<string name="wifi_enable_watchdog_service_summary">Detect and manage potential network connectivity problems</string>
<!-- Setting title for setting the wifi sleep policy -->
<string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string>
<!-- Setting summary for setting the wifi sleep policy -->

7
res/xml/wifi_advanced_settings.xml
View File

@@ -24,6 +24,13 @@
android:summary="@string/wifi_notify_open_networks_summary"
android:persistent="false" />
<!-- android:dependency="enable_wifi" -->
<CheckBoxPreference
android:key="wifi_enable_watchdog_service"
android:title="@string/wifi_enable_watchdog_service"
android:summary="@string/wifi_enable_watchdog_service_summary"
android:persistent="false" />
<ListPreference
android:key="sleep_policy"
android:title="@string/wifi_setting_sleep_policy_title"

13
src/com/android/settings/wifi/AdvancedSettings.java
View File

@@ -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();

1
src/com/android/settings/wifi/AdvancedWifiSettings.java
View File

@@ -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;