From 564e68aecef3d8d3e850bdb969c60a756208de83 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Fri, 3 Dec 2010 12:26:20 -0800
Subject: [PATCH 1/4] Fix crash when removing account.

Bug: 3248351
---
 src/com/android/settings/accounts/AccountSyncSettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 141f2445f36..cbd8feedb45 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -346,6 +346,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
 
     @Override
     protected void onSyncStateUpdated() {
+        if (!isResumed()) return;
         // iterate over all the preferences, setting the state properly for each
         Date date = new Date();
         List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncs();

From afc2aacf0015fbb3a79b1f29ce552fe35efe58b7 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Fri, 3 Dec 2010 10:21:50 -0800
Subject: [PATCH 2/4] Use new config change broadcasts

Bug: 3237735
Change-Id: I29e2807f76d54354bf501b2e7655f49386e6bf95
---
 src/com/android/settings/wifi/WifiSettings.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ff4f390638a..dbaeda21922 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -124,7 +124,8 @@ public class WifiSettings extends SettingsPreferenceFragment
         mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
         mFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
         mFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.SUPPLICANT_CONFIG_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
         mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
         mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
 
@@ -423,7 +424,8 @@ public class WifiSettings extends SettingsPreferenceFragment
             updateWifiState(intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
                     WifiManager.WIFI_STATE_UNKNOWN));
         } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action) ||
-                WifiManager.SUPPLICANT_CONFIG_CHANGED_ACTION.equals(action)) {
+                WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION.equals(action) ||
+                WifiManager.LINK_CONFIGURATION_CHANGED_ACTION.equals(action)) {
                 updateAccessPoints();
         } else if (WifiManager.SUPPLICANT_STATE_CHANGED_ACTION.equals(action)) {
             //Ignore supplicant state changes when network is connected

From c1bad6bc68020590b7d6df50fdacaa28201b006f Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Fri, 3 Dec 2010 15:56:02 -0800
Subject: [PATCH 3/4] scan immediately when user indicates so

Bug: 3242989
Change-Id: Ia15d7a61a40b64830a7840b7d31e6b5f96b2ad78
---
 src/com/android/settings/wifi/WifiSettings.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index dbaeda21922..52d053f7513 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -241,7 +241,7 @@ public class WifiSettings extends SettingsPreferenceFragment
         switch (item.getItemId()) {
             case MENU_ID_SCAN:
                 if (mWifiManager.isWifiEnabled()) {
-                    mScanner.resume();
+                    mScanner.forceScan();
                 }
                 return true;
             case MENU_ID_ADVANCED:
@@ -499,6 +499,10 @@ public class WifiSettings extends SettingsPreferenceFragment
             }
         }
 
+        void forceScan() {
+            sendEmptyMessage(0);
+        }
+
         void pause() {
             mRetry = 0;
             mAccessPoints.setProgress(false);

From 71ac31906a5f933b82b58c706833b04a2c8ac13e Mon Sep 17 00:00:00 2001
From: Roy West <rwest@android.com>
Date: Sat, 4 Dec 2010 08:50:03 -0800
Subject: [PATCH 4/4] Change Storage settings entry to just that on all
 platforms.

Change-Id: I3bf714f67a143a94b922cb25f0ecb27ac2c621ba
---
 res/values/strings.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3523b760498..7c09c711b3d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1404,11 +1404,9 @@
     <string name="device_status">Status</string>
     <!-- About phone screen, summary of the item to go into the phone status screen -->
     <string name="device_status_summary">Phone number, signal, etc.</string>
-    <!-- Main settings screen item's title to go into the SD card and storage settings screen [CHAR LIMIT=25] -->
-    <string name="storage_settings" product="nosdcard">Shared &amp; secure storage</string>
-    <!-- Main settings screen item's title to go into the SD card and storage settings screen-->
-    <string name="storage_settings" product="default">Storage</string>
-    <!-- SD card and storage settings screen title -->
+    <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+    <string name="storage_settings" >Storage</string>
+    <!-- Storage settings screen title -->
     <string name="storage_settings_title">Storage settings</string>
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
     <string name="storage_settings_summary" product="nosdcard">Unmount USB storage, view available storage</string>