am 7e776ad7: am 3eb0f422: am eff0927d: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev

* commit '7e776ad76ce60eb0c68fb54b640b18c0e9843a04':
  Once we decide to show Home settings, keep it shown forever

2 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index 14e1d9fe3..eb659e27e 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -49,7 +49,8 @@ public class HomeSettings extends SettingsPreferenceFragment {
 
     static final int REQUESTING_UNINSTALL = 10;
 
-    public static final String CURRENT_HOME = "current_home";
+    public static final String HOME_PREFS = "home_prefs";
+    public static final String HOME_PREFS_DO_SHOW = "do_show";
 
     public static final String HOME_SHOW_NOTICE = "show";
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f34c1bc47..bf5378f98 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -689,6 +689,12 @@ public class Settings extends PreferenceActivity
     }
 
     private boolean updateHomeSettingHeaders(Header header) {
+        // Once we decide to show Home settings, keep showing it forever
+        SharedPreferences sp = getSharedPreferences(HomeSettings.HOME_PREFS, Context.MODE_PRIVATE);
+        if (sp.getBoolean(HomeSettings.HOME_PREFS_DO_SHOW, false)) {
+            return true;
+        }
+
         try {
             final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
             getPackageManager().getHomeActivities(homeApps);
@@ -715,6 +721,8 @@ public class Settings extends PreferenceActivity
             // Can't look up the home activity; bail on configuring the icon
             Log.w(LOG_TAG, "Problem looking up home activity!", e);
         }
+
+        sp.edit().putBoolean(HomeSettings.HOME_PREFS_DO_SHOW, true).apply();
         return true;
     }