commit 17f67ad967166072e11faf6d890acfba7aead27d
author Eric Fischer <enf@google.com> Tue Apr 24 13:55:56 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 13:55:56 2012 -0700
tree 01028b60cf3f681c228010a87f778e5821b4b649
parent 3ec1cd077193dd3487ee5b8c97ed1a31db1fd72c
parent 335c8c86b7ab1e96104121e21be255eee083540c

Merge "Import translations. DO NOT MERGE"

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 62c86d8..7d45461 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -794,6 +794,7 @@
 
             final boolean matchFound = pm.resolveActivity(mAppSettingsIntent, 0) != null;
             mAppSettings.setEnabled(matchFound);
+            mAppSettings.setVisibility(View.VISIBLE);
 
         } else {
             mAppSettingsIntent = null;
@@ -1060,6 +1061,8 @@
     private OnClickListener mAppSettingsListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
+            if (!isAdded()) return;
+
             // TODO: target torwards entire UID instead of just first package
             startActivity(mAppSettingsIntent);
         }

src/com/android/settings/UserDictionarySettings.java

diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index f4206eb..0b93a6a 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -171,8 +171,11 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        showAddOrEditDialog(null);
-        return true;
+        if (item.getItemId() == OPTIONS_MENU_ADD) {
+            showAddOrEditDialog(null);
+            return true;
+        }
+        return false;
     }
 
     /**

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 04d0220..36bae32 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -527,6 +527,9 @@
      * the strength of network and the security for it.
      */
     private void updateAccessPoints() {
+        // Safeguard from some delayed event handling
+        if (getActivity() == null) return;
+
         final int wifiState = mWifiManager.getWifiState();
 
         switch (wifiState) {