From abeff000fdd0c421ee514effb83c202174209b9d Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Sat, 29 Jan 2011 08:58:23 -0800
Subject: [PATCH] Change sleep policy strings

Bug: 3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
---
 res/values/arrays.xml  |  4 ++--
 res/values/strings.xml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4fd20c078c3..3ef465a8daa 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -306,11 +306,11 @@
     <!-- 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</item>
+        <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</item>
+        <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 />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 38536cfe908..5122d787a30 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -981,6 +981,12 @@
     <string name="wifi_notify_open_networks">Network notification</string>
     <!-- Checkbox summary for option to notify user when open networks are nearby -->
     <string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string>
+    <!-- Setting title for setting the wifi sleep policy -->
+    <string name="wifi_setting_sleep_policy_title">Disconnect from Wi-Fi</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>
+    <!-- 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 message to manually add a wifi network -->
     <string name="wifi_add_network">Add Wi-Fi network</string>
     <!-- Header for the list of wifi networks-->
@@ -1073,12 +1079,6 @@
     <!-- Wi-Fi Advanced Settings --> <skip />
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. -->
     <string name="wifi_advanced_titlebar">Advanced</string>
-    <!-- Wi-Fi settings screen, setting title for setting the wifi sleep policy -->
-    <string name="wifi_setting_sleep_policy_title">Wi-Fi sleep policy</string>
-    <!-- Wi-Fi settings screen, 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>
-    <!-- Wi-Fi settings screen, generic error message when the sleep policy could not be set. -->
-    <string name="wifi_setting_sleep_policy_error">There was a problem setting the sleep policy.</string>
     <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
     <string name="wifi_setting_frequency_band_title">Wi-Fi frequency band</string>
     <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->