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

Conflicts:
	res/layout/settings_pane_list_item.xml
	res/values/cm_strings.xml
	src/com/android/launcher3/DeviceProfile.java
	src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java

Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5

1 files changed, 13 insertions, 19 deletions

diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 9fe1d7e06..f9430831c 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -39,42 +39,36 @@ 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()) {
-            values = new String[]{
+        String[] values = new String[]{
                     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)};
-        } 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)};
-        }
-
-        mValues = values;
+                    res.getString(R.string.scrolling_wallpaper),
+                    res.getString(R.string.grid_size_text)};
 
         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);
     }
 
@@ -173,7 +167,7 @@ public class OverviewSettingsPanel {
                     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.hide_icon_labels)};
+                    res.getString(R.string.icon_labels)};
             mSettingsAdapter.changeCursor(0, createCursor(res
                     .getString(R.string.home_screen_settings), values));
         }