Replace ugly Drawer setting (Sort Mode)

Change-Id: Iabedd48c43cd30ea747af093fad6d3874495bced

2 files changed, 17 insertions, 3 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1ea2c9fdc..8fa5cfdd6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3176,7 +3176,7 @@ public class Launcher extends Activity
         }
     }
 
-    protected AppsCustomizePagedView getAppsCustomizeContent() {
+    public AppsCustomizePagedView getAppsCustomizeContent() {
         return mAppsCustomizeContent;
     }
 
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index ccfe0b1ba..695f131cf 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -13,8 +13,9 @@ import android.widget.TextView;
 import android.widget.Toast;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.OverviewSettingsPanel;
-import com.android.launcher3.PagedView;
+import com.android.launcher3.AppsCustomizePagedView;
 import com.android.launcher3.R;
+
 import com.android.launcher3.settings.SettingsProvider;
 import android.view.View.OnClickListener;
 import android.content.SharedPreferences;
@@ -215,7 +216,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                 mLauncher.updateDynamicGrid();
             } else if (value.equals(res
                     .getString(R.string.drawer_sorting_text))) {
-                mLauncher.onClickSortModeButton(v);
+                onClickTransitionEffectButton();
             } else if (value.equals(res
                     .getString(R.string.scroll_effect_text)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.DRAWER_SETTINGS_POSITION)) {
@@ -303,4 +304,17 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                 R.string.setting_state_on);
         ((TextView) v.findViewById(R.id.item_state)).setText(state);
     }
+
+    private void onClickTransitionEffectButton() {
+        int sort = SettingsProvider.getIntCustomDefault(mLauncher,
+                SettingsProvider.SETTINGS_UI_DRAWER_SORT_MODE, 0);
+
+        sort = (sort + 1) % AppsCustomizePagedView.SortMode.values().length;
+        mLauncher.getAppsCustomizeContent().setSortMode(
+                AppsCustomizePagedView.SortMode.getModeForValue(sort));
+
+        SettingsProvider.putInt(mLauncher, SettingsProvider.SETTINGS_UI_DRAWER_SORT_MODE, sort);
+
+        notifyDataSetChanged();
+    }
 }