Customizeable Dynamic Grid:

 - Presets
   - Comfortable (+0)
   - Cozy (+1)
   - Condensed (+2)
 - Custom option with min, max

Reordering items in the settings pane for better organization
Modifying Settings Layout for readability

Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5

1 files changed, 13 insertions, 6 deletions

diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 3cc41e1c6..4466c15de 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -40,7 +40,8 @@ public class OverviewSettingsPanel {
         Resources res = mLauncher.getResources();
         String[] headers = new String[] {
                 res.getString(R.string.home_screen_settings),
-                res.getString(R.string.drawer_settings)};
+                res.getString(R.string.drawer_settings),
+                res.getString(R.string.app_settings)};
 
         String[] values;
         if(mLauncher.isGelIntegrationSupported()) {
@@ -48,16 +49,16 @@ public class OverviewSettingsPanel {
                     res.getString(R.string.home_screen_search_text),
                     res.getString(R.string.search_screen_left_text),
                     res.getString(R.string.scroll_effect_text),
-                    res.getString(R.string.larger_icons_text),
                     res.getString(R.string.icon_labels),
-                    res.getString(R.string.scrolling_wallpaper)};
+                    res.getString(R.string.scrolling_wallpaper),
+                    res.getString(R.string.grid_size_text)};
         } else {
             values = new String[]{
                     res.getString(R.string.home_screen_search_text),
                     res.getString(R.string.scroll_effect_text),
-                    res.getString(R.string.larger_icons_text),
                     res.getString(R.string.icon_labels),
-                    res.getString(R.string.scrolling_wallpaper)};
+                    res.getString(R.string.scrolling_wallpaper),
+                    res.getString(R.string.grid_size_text)};
         }
 
         mValues = values;
@@ -65,17 +66,23 @@ public class OverviewSettingsPanel {
         String[] valuesDrawer = new String[] {
                 res.getString(R.string.scroll_effect_text),
                 res.getString(R.string.drawer_sorting_text),
-                res.getString(R.string.icon_labels),
+                res.getString(R.string.icon_labels)};
+
+        String[] valuesApp = new String[] {
+                res.getString(R.string.larger_icons_text),
                 res.getString(R.string.protected_app_settings)};
 
+
         mSettingsAdapter = new SettingsPinnedHeaderAdapter(mLauncher);
         mSettingsAdapter.setHeaders(headers);
         mSettingsAdapter.addPartition(false, true);
         mSettingsAdapter.addPartition(false, true);
+        mSettingsAdapter.addPartition(false, true);
         mSettingsAdapter.mPinnedHeaderCount = headers.length;
 
         mSettingsAdapter.changeCursor(0, createCursor(headers[0], values));
         mSettingsAdapter.changeCursor(1, createCursor(headers[1], valuesDrawer));
+        mSettingsAdapter.changeCursor(2, createCursor(headers[2], valuesApp));
         mListView.setAdapter(mSettingsAdapter);
     }