Trebuchet: Open settings panel when clicking settings

Issue-id: CYNGNOS-2002

Change-Id: I4fc2ffd17febc8f1e5fa804e6a26feaa51a29c4b
(cherry picked from commit 6a173a6c38239918892dd307465afc633288bf32)

1 files changed, 16 insertions, 21 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 457c74637..6224b8248 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -283,7 +283,7 @@ public class Launcher extends Activity
     private boolean mHiddenFolderAuth = false;
 
     @Thunk Hotseat mHotseat;
-    private ViewGroup mOverviewPanel;
+    private VerticalSlidingPanel mOverviewPanel;
     private View mDarkPanel;
     OverviewSettingsPanel mOverviewSettingsPanel;
 
@@ -1355,17 +1355,6 @@ public class Launcher extends Activity
         }
     }
 
-    protected void startSettings() {
-        Intent settings;
-        settings = new Intent(android.provider.Settings.ACTION_SETTINGS);
-        startActivity(settings);
-        LauncherApplication.getLauncherStats().sendSettingsOpenedEvent(
-                LauncherStats.ORIGIN_TREB_LONGPRESS);
-        if (mWorkspace.isInOverviewMode()) {
-            mWorkspace.exitOverviewMode();
-        }
-    }
-
     public void addToCustomContentPage(View customContent,
             CustomContentCallbacks callbacks, String description) {
         mWorkspace.addToCustomContentPage(customContent, callbacks, description);
@@ -1530,7 +1519,7 @@ public class Launcher extends Activity
         }
 
         // Setup the overview panel
-        mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel);
+        mOverviewPanel = (VerticalSlidingPanel) findViewById(R.id.overview_panel);
         mOverviewSettingsPanel = new OverviewSettingsPanel(this);
         mOverviewSettingsPanel.initializeAdapter();
 
@@ -1584,20 +1573,19 @@ public class Launcher extends Activity
         });
         defaultScreenButton.setOnTouchListener(getHapticFeedbackTouchListener());
 
-        final VerticalSlidingPanel verticalSlidingPanel = ((VerticalSlidingPanel) mOverviewPanel);
-        verticalSlidingPanel.setPanelSlideListener(new SettingsPanelSlideListener());
-        verticalSlidingPanel.setEnableDragViewTouchEvents(true);
+        mOverviewPanel.setPanelSlideListener(new SettingsPanelSlideListener());
+        mOverviewPanel.setEnableDragViewTouchEvents(true);
 
         View settingsPaneHeader = mOverviewPanel.findViewById(R.id.settings_pane_header);
         if (settingsPaneHeader != null) {
-            verticalSlidingPanel.setDragView(settingsPaneHeader);
+            mOverviewPanel.setDragView(settingsPaneHeader);
             settingsPaneHeader.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (verticalSlidingPanel.isExpanded()) {
-                        verticalSlidingPanel.collapsePane();
+                    if (mOverviewPanel.isExpanded()) {
+                        mOverviewPanel.collapsePane();
                     } else {
-                        verticalSlidingPanel.expandPane();
+                        mOverviewPanel.expandPane();
                     }
                 }
             });
@@ -3193,7 +3181,11 @@ public class Launcher extends Activity
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onClickSettingsButton(v);
         } else {
-            startSettings();
+            if (mOverviewPanel.isExpanded()) {
+                mOverviewPanel.collapsePane();
+            } else {
+                mOverviewPanel.expandPane();
+            }
         }
     }
 
@@ -5275,6 +5267,9 @@ public class Launcher extends Activity
 
             AnimationDrawable frameAnimation = (AnimationDrawable) mAnimatedArrow.getBackground();
             frameAnimation.start();
+
+            LauncherApplication.getLauncherStats().sendSettingsOpenedEvent(
+                    LauncherStats.ORIGIN_TREB_LONGPRESS);
         }
 
         @Override