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

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

Browse Source 
* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.
This commit is contained in:
Amith Yamasani
2011-03-02 22:16:41 -08:00
committed by Android Git Automerger
parent 1de75d44ac 665fc6aadd
commit fb6f306a2b
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/arrays.xml
View File

@@ -333,6 +333,17 @@
<item>Never (uses more battery power)</item> <item>Never (uses more battery power)</item>
</string-array> </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 /> <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. --> <skip />
<!-- Do not translate. --> <!-- Do not translate. -->
<string-array name="wifi_sleep_policy_values"> <string-array name="wifi_sleep_policy_values">

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

@@ -217,14 +217,13 @@ public class WifiSettings extends SettingsPreferenceFragment
ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY); ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
if (pref != null) { if (pref != null) {
if (Utils.isWifiOnly()) { if (Utils.isWifiOnly()) {
getPreferenceScreen().removePreference(pref); pref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
} 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.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()); registerForContextMenu(getListView());