am 665fc6aa: am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb

* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.

2 files changed, 17 insertions, 7 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f02c444..6194719 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -333,6 +333,17 @@
         <item>Never (uses more battery power)</item>
     </string-array>
 
+    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+    <string-array name="wifi_sleep_policy_entries_wifi_only">
+        <!-- Wi-Fi should go to sleep when the screen turns off, for Wi-Fi-only devices. -->
+        <item>When screen turns off</item>
+        <!-- When plugged in, never go to sleep.  When on battery, go to sleep when screen turns off. -->
+        <item>Never when plugged in</item>
+        <!-- Never go to sleep. -->
+        <item>Never (uses more battery power)</item>
+    </string-array>
+
     <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. --> <skip />
     <!-- Do not translate. -->
     <string-array name="wifi_sleep_policy_values">
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index b621426..67218e8 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -217,14 +217,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());