Settings adapter should use the position and partition values

Fixes:
https://jira.cyanogenmod.org/browse/BACON-587

Conflicts:
	src/com/android/launcher3/OverviewSettingsPanel.java
	src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java

Change-Id: Ie935c51ea1e68eaa7da64b23eaf2ae28a630a3bb

1 files changed, 13 insertions, 10 deletions

diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 91f7f0dd7..b52c9f616 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -19,6 +19,7 @@ public class OverviewSettingsPanel {
             "com.android.settings.Settings$ThemeSettingsActivity";
     public static final int HOME_SETTINGS_POSITION = 0;
     public static final int DRAWER_SETTINGS_POSITION = 1;
+    public static final int APP_SETTINGS_POSITION = 2;
 
     private Launcher mLauncher;
     private View mOverviewPanel;
@@ -43,11 +44,11 @@ public class OverviewSettingsPanel {
                 res.getString(R.string.app_settings)};
 
         String[] values = new String[]{
-                    res.getString(R.string.home_screen_search_text),
-                    res.getString(R.string.scroll_effect_text),
-                    res.getString(R.string.icon_labels),
-                    res.getString(R.string.scrolling_wallpaper),
-                    res.getString(R.string.grid_size_text)};
+                res.getString(R.string.home_screen_search_text),
+                res.getString(R.string.scroll_effect_text),
+                res.getString(R.string.icon_labels),
+                res.getString(R.string.scrolling_wallpaper),
+                res.getString(R.string.grid_size_text)};
 
         String[] valuesDrawer = new String[] {
                 res.getString(R.string.scroll_effect_text),
@@ -66,9 +67,10 @@ public class OverviewSettingsPanel {
         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));
+        mSettingsAdapter.changeCursor(HOME_SETTINGS_POSITION, createCursor(headers[0], values));
+        mSettingsAdapter.changeCursor(DRAWER_SETTINGS_POSITION, createCursor(headers[1],
+                valuesDrawer));
+        mSettingsAdapter.changeCursor(APP_SETTINGS_POSITION, createCursor(headers[2], valuesApp));
         mListView.setAdapter(mSettingsAdapter);
     }
 
@@ -166,8 +168,9 @@ public class OverviewSettingsPanel {
             String[] 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.icon_labels),
+                    res.getString(R.string.scrolling_wallpaper),
+                    res.getString(R.string.grid_size_text)};
             mSettingsAdapter.changeCursor(0, createCursor(res
                     .getString(R.string.home_screen_settings), values));
         }