Settings: Show Search Bar

Change-Id: I7e5c301cd3d0212fbfe0a96de0435ddded4cabaa

2 files changed, 31 insertions, 3 deletions

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index e9cf6fe1a..bad49b1a5 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -62,6 +62,11 @@ public class SettingsActivity extends PreferenceActivity
     }
 
     @Override
+    public boolean isValidFragment(String fragmentName) {
+        return true;
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
@@ -113,6 +118,15 @@ public class SettingsActivity extends PreferenceActivity
         editor.commit();
     }
 
+    public static class HomescreenFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            addPreferencesFromResource(R.xml.preferences_homescreen);
+        }
+    }
+
     private static class HeaderAdapter extends ArrayAdapter<Header> {
         private static final int HEADER_TYPE_NORMAL = 0;
         private static final int HEADER_TYPE_CATEGORY = 1;
diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java
index 30a7732b9..fdf2757df 100644
--- a/src/com/android/launcher3/settings/SettingsProvider.java
+++ b/src/com/android/launcher3/settings/SettingsProvider.java
@@ -26,6 +26,8 @@ public final class SettingsProvider {
 
     public static final String SETTINGS_CHANGED = "settings_changed";
 
+    public static final String SETTINGS_UI_HOMESCREEN_SEARCH = "ui_homescreen_search";
+
     private static Map<String, ?> sKeyValues;
 
     public static void load(Context context) {
@@ -33,18 +35,30 @@ public final class SettingsProvider {
         sKeyValues = preferences.getAll();
     }
 
-    private static int getInt(String key, int def) {
+    public static int getInt(String key, int def) {
         return sKeyValues.containsKey(key) && sKeyValues.get(key) instanceof Integer ?
                 (Integer) sKeyValues.get(key) : def;
     }
 
-    private static boolean getBoolean(String key, boolean def) {
+    public static int getInt(String key, Context context, int resource) {
+        return getInt(key, context.getResources().getInteger(resource));
+    }
+
+    public static boolean getBoolean(String key, boolean def) {
         return sKeyValues.containsKey(key) && sKeyValues.get(key) instanceof Boolean ?
                 (Boolean) sKeyValues.get(key) : def;
     }
 
-    private static String getString(String key, String def) {
+    public static boolean getBoolean(String key, Context context, int resource) {
+        return getBoolean(key, context.getResources().getBoolean(resource));
+    }
+
+    public static String getString(String key, String def) {
         return sKeyValues.containsKey(key) && sKeyValues.get(key) instanceof String ?
                 (String) sKeyValues.get(key) : def;
     }
+
+    public static String getString(String key, Context context, int resource) {
+        return getString(key, context.getResources().getString(resource));
+    }
 }