commit 77057e282b575a77ee9a4cf8e1a63bc510b0fd2f
author Eric Fischer <enf@google.com> Tue Jan 11 17:39:47 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 11 17:39:47 2011 -0800
tree 5066a4160a8c557674d686255d867b5f86fbba38
parent 282ef24a3aa3ecf14cf68892406daba0858b6fa4
parent a793c57291cc63f12b5f4c603c2ad474337e7fb7

Merge "Update large-screen translations." into honeycomb

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 669e928..7012440 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2945,7 +2945,7 @@
 
     <!-- Wifi Setup For Setup Wizard with XL screen -->
     <!-- Title shown in Wifi Setup For Setup Wizard with XL screen -->
-    <string name="wifi_setup_title">WiFi setup</string>
+    <string name="wifi_setup_title">Wi-Fi setup</string>
     <!-- Text message shown when Wifi is not connected.
          Used in Wifi Setup For Setup Wizard with XL screen. -->
     <string name="wifi_setup_not_connected">Not connected</string>

src/com/android/settings/wifi/AdvancedSettings.java

diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
index 1968eb0..74948f0 100644
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -66,7 +66,8 @@
         ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
         pref.setOnPreferenceChangeListener(this);
         int value = Settings.System.getInt(getContentResolver(),
-                Settings.System.WIFI_SLEEP_POLICY, Settings.System.WIFI_SLEEP_POLICY_DEFAULT);
+                Settings.System.WIFI_SLEEP_POLICY,
+                Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED);
         pref.setValue(String.valueOf(value));
 
         pref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);