diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-03-02 22:16:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-02 22:16:41 -0800 |
| commit | fb6f306a2bd29e3bea1447e857a8e6461c0b02c0 (patch) | |
| tree | 5abd970be346ea48d50af236d254b5ba41415e71 /res/values/arrays.xml | |
| parent | 1de75d44ac7064184bf78a63434db8bf6a641772 (diff) | |
| parent | 665fc6aadd07b831dcb72d1e04199fd26b6049b6 (diff) | |
| download | packages_apps_Settings-fb6f306a2bd29e3bea1447e857a8e6461c0b02c0.zip packages_apps_Settings-fb6f306a2bd29e3bea1447e857a8e6461c0b02c0.tar.gz packages_apps_Settings-fb6f306a2bd29e3bea1447e857a8e6461c0b02c0.tar.bz2 | |
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.
Diffstat (limited to 'res/values/arrays.xml')
| -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 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"> |