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

Merge "Bug 5042999: Wi-Fi disconnect policy strings"

Browse Source
This commit is contained in:
Gilles Debunne
2011-09-09 09:47:29 -07:00
committed by Android (Google) Code Review
parent 3d5c990b63 829c556645
commit e5d6179291
4 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/values/arrays.xml
View File

@@ -358,34 +358,34 @@
<!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
<string-array name="wifi_sleep_policy_entries">
<!-- Wi-Fi should go to sleep when the screen turns off. -->
<item>When screen turns off (uses more mobile data)</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>
<!-- Always keep Wi-Fi on when screen turns off. -->
<item>Always</item>
<!-- Keep Wi-Fi on when screen turns off and plugged in. When on battery, go to sleep when screen turns off. -->
<item>Only when plugged in</item>
<!-- Do not keep Wi-Fi on when screen turns off. -->
<item>Never (increases data usage)</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>
<!-- Always keep Wi-Fi on when screen turns off. -->
<item>Always</item>
<!-- Keep Wi-Fi on when screen turns off and plugged in. When on battery, go to sleep when screen turns off. -->
<item>Only when plugged in</item>
<!-- Do not keep Wi-Fi on when screen turns off, for Wi-Fi-only devices, no other data connection -->
<item>Never</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">
<!-- Do not translate. -->
<item>0</item>
<item>2</item>
<!-- Do not translate. -->
<item>1</item>
<!-- Do not translate. -->
<item>2</item>
<item>0</item>
</string-array>
<!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->

8
res/values/strings.xml
View File

@@ -1150,12 +1150,8 @@
<string name="wifi_enable_watchdog_service">Avoid poor connections</string>
<!-- Checkbox summary for option to toggle wifi watchdog service -->
<string name="wifi_enable_watchdog_service_summary">Don\'t use a Wi-Fi network unless it has a decent internet connection</string>
<!-- Setting title for setting the wifi sleep policy -->
<string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string>
<!-- Setting summary for setting the wifi sleep policy -->
<string name="wifi_setting_sleep_policy_summary">Specify when to switch from Wi-Fi to mobile data</string>
<!-- Setting summary for setting the wifi sleep policy for wifi-only devices [CHAR LIMIT=100] -->
<string name="wifi_setting_sleep_policy_summary_wifi_only">Specify when to disconnect from Wi-Fi</string>
<!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
<string name="wifi_setting_sleep_policy_title">Keep Wi-Fi during sleep</string>
<!-- Generic error message when the sleep policy could not be set. -->
<string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
<!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->