diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-03-02 18:25:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-02 18:25:11 -0800 |
| commit | 665fc6aadd07b831dcb72d1e04199fd26b6049b6 (patch) | |
| tree | e025edd4a6b861d0cf60c0ef8b07eb2172e07647 /res/values | |
| parent | 71dcf4d2c4de4cb38d287301a7bdca1643a7156d (diff) | |
| parent | b7e393bf9b0327833098d2181b0e7125af2181dc (diff) | |
| download | packages_apps_Settings-665fc6aadd07b831dcb72d1e04199fd26b6049b6.zip packages_apps_Settings-665fc6aadd07b831dcb72d1e04199fd26b6049b6.tar.gz packages_apps_Settings-665fc6aadd07b831dcb72d1e04199fd26b6049b6.tar.bz2 | |
am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb
* commit 'b7e393bf9b0327833098d2181b0e7125af2181dc':
Bring back Wi-Fi sleep policy setting for wifi-only devices.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3ef465a..6df4c90 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -313,6 +313,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"> |