1 files changed, 36 insertions, 30 deletions
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index fe0567b33..202df1727 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -10,6 +10,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.OverviewSettingsPanel;
 import com.android.launcher3.AppsCustomizePagedView;
@@ -120,17 +122,6 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                     R.string.icon_labels_hide) : res.getString(
                     R.string.icon_labels_show);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
-        } else if (title.equals(res
-                .getString(R.string.search_screen_left_text))) {
-            boolean current = SettingsProvider
-                    .getBoolean(
-                            mContext,
-                            SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT,
-                            R.bool.preferences_interface_homescreen_search_screen_left_default);
-            String state = current ? res.getString(
-                    R.string.setting_state_on) : res.getString(
-                    R.string.setting_state_off);
-            ((TextView) v.findViewById(R.id.item_state)).setText(state);
         } else if (title.equals(res.getString(R.string.scrolling_wallpaper))) {
             boolean current = SettingsProvider
                     .getBoolean(
@@ -141,6 +132,8 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                     R.string.setting_state_on) : res.getString(
                     R.string.setting_state_off);
             ((TextView) v.findViewById(R.id.item_state)).setText(state);
+        } else if (title.equals(res.getString(R.string.grid_size_text))) {
+            updateDynamicGridSizeSettingsItem(v);
         } else {
             ((TextView) v.findViewById(R.id.item_state)).setText("");
         }
@@ -182,6 +175,34 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
         ((TextView) v.findViewById(R.id.item_state)).setText(state);
     }
 
+    public void updateDynamicGridSizeSettingsItem(View v) {
+        DeviceProfile.GridSize gridSize = DeviceProfile.GridSize.getModeForValue(
+                SettingsProvider.getIntCustomDefault(mLauncher,
+                SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, 0));
+        String state = "";
+
+        switch (gridSize) {
+            case Comfortable:
+                state = mLauncher.getResources().getString(R.string.grid_size_comfortable);
+                break;
+            case Cozy:
+                state = mLauncher.getResources().getString(R.string.grid_size_cozy);
+                break;
+            case Condensed:
+                state = mLauncher.getResources().getString(R.string.grid_size_condensed);
+                break;
+            case Custom:
+                state = mLauncher.getResources().getString(R.string.grid_size_custom);
+                int rows = SettingsProvider.getIntCustomDefault(mLauncher,
+                        SettingsProvider.SETTINGS_UI_HOMESCREEN_ROWS, 0);
+                int columns = SettingsProvider.getIntCustomDefault(mLauncher,
+                        SettingsProvider.SETTINGS_UI_HOMESCREEN_COLUMNS, 0);
+                state += "(" + rows + "x" + columns + ")";
+                break;
+        }
+        ((TextView) v.findViewById(R.id.item_state)).setText(state);
+    }
+
     private String mapEffectToValue(String effect) {
         final String[] titles = mLauncher.getResources().getStringArray(
                 R.array.transition_effect_entries);
@@ -252,6 +273,8 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                 intent.setClassName(OverviewSettingsPanel.ANDROID_SETTINGS,
                         OverviewSettingsPanel.ANDROID_PROTECTED_APPS);
                 mLauncher.startActivity(intent);
+            } else if (value.equals(res.getString(R.string.protected_app_settings))) {
+
             } else if (value.equals(res
                     .getString(R.string.scrolling_wallpaper))) {
                 onSettingsBooleanChanged(
@@ -260,25 +283,8 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                         R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
                 mLauncher.updateDynamicGrid();
             } else if (value.equals(res
-                    .getString(R.string.search_screen_left_text)) &&
-                    ((Integer)v.getTag() == OverviewSettingsPanel.HOME_SETTINGS_POSITION)) {
-
-                boolean current = SettingsProvider.getBoolean(mContext,
-                        SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT,
-                        R.bool.preferences_interface_homescreen_search_screen_left_default);
-
-                // If GEL integration is not supported, do not allow the user to turn it on.
-                if(!current && !mLauncher.isGelIntegrationSupported()) {
-                    Toast.makeText(mLauncher.getApplicationContext(),
-                            res.getString(R.string.search_screen_left_unsupported_toast),
-                            Toast.LENGTH_SHORT).show();
-                } else {
-                    onSettingsBooleanChanged(
-                            v,
-                            SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT,
-                            R.bool.preferences_interface_homescreen_search_screen_left_default);
-                    mLauncher.updateDynamicGrid();
-                }
+                    .getString(R.string.grid_size_text))) {
+                mLauncher.onClickDynamicGridSizeButton();
             }
 
             View defaultHome = mLauncher.findViewById(R.id.default_home_screen_panel);