diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3ef465a8daa..6df4c9023df 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -313,6 +313,17 @@ Never (uses more battery power) + + + + When screen turns off + + Never when plugged in + + Never (uses more battery power) + + diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 5a2bf45d5f6..52bf3662d30 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -213,14 +213,13 @@ public class WifiSettings extends SettingsPreferenceFragment ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY); if (pref != null) { if (Utils.isWifiOnly()) { - getPreferenceScreen().removePreference(pref); - } else { - pref.setOnPreferenceChangeListener(this); - int value = Settings.System.getInt(getContentResolver(), - Settings.System.WIFI_SLEEP_POLICY, - Settings.System.WIFI_SLEEP_POLICY_NEVER); - pref.setValue(String.valueOf(value)); + pref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only); } + pref.setOnPreferenceChangeListener(this); + int value = Settings.System.getInt(getContentResolver(), + Settings.System.WIFI_SLEEP_POLICY, + Settings.System.WIFI_SLEEP_POLICY_NEVER); + pref.setValue(String.valueOf(value)); } registerForContextMenu(getListView());