diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-03-02 10:51:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 10:51:36 -0800 |
| commit | b7e393bf9b0327833098d2181b0e7125af2181dc (patch) | |
| tree | eeb2152f52a9355d5c47d8ad93be017b7f3e1eb8 /res/values/arrays.xml | |
| parent | 88764d6a928065b85f9377cab7ab388604dce12c (diff) | |
| parent | 967da9517f85be677750a63c8e6d6ff24955b4e2 (diff) | |
| download | packages_apps_Settings-b7e393bf9b0327833098d2181b0e7125af2181dc.zip packages_apps_Settings-b7e393bf9b0327833098d2181b0e7125af2181dc.tar.gz packages_apps_Settings-b7e393bf9b0327833098d2181b0e7125af2181dc.tar.bz2 | |
Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb
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 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"> |