Trebuchet: Auto collapse settings panel

Issue-id: CYNGNOS-1425

Change-Id: I26896332431eb42dc4727a4f2bb9c4c0a3cfbcc5

2 files changed, 23 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8925a72a2..37635da0c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -816,6 +816,7 @@ public class Launcher extends Activity
                 // When the user has granted permission to bind widgets, we should check to see if
                 // we can inflate the default search bar widget.
                 getOrCreateQsbBar();
+                showWorkspace(false);
             }
             return;
         } else if (requestCode == REQUEST_PICK_WALLPAPER) {
@@ -3687,6 +3688,10 @@ public class Launcher extends Activity
         boolean changed = mState != State.WORKSPACE ||
                 mWorkspace.getState() != Workspace.State.NORMAL;
         if (changed) {
+            // Close overview mode if open
+            if (mWorkspace.isInOverviewMode()) {
+                mWorkspace.exitOverviewMode();
+            }
             mWorkspace.setVisibility(View.VISIBLE);
             mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
                     Workspace.State.NORMAL, snapToPage, animated, onCompleteRunnable);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 09a0a9889..54d153299 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2003,6 +2003,24 @@ public class Workspace extends PagedView
         return mState == State.OVERVIEW;
     }
 
+    public boolean enterOverviewMode() {
+        if (mTouchState != TOUCH_STATE_REST) {
+            return false;
+        }
+        enableOverviewMode();
+        return true;
+    }
+
+    public void exitOverviewMode() {
+        ((OverviewPanel) mLauncher.getOverviewPanel()).collapsePane();
+        reloadSettings();
+    }
+
+    private void enableOverviewMode() {
+        reloadSettings();
+    }
+
+
     int getOverviewModeTranslationY() {
         DeviceProfile grid = mLauncher.getDeviceProfile();
         Rect workspacePadding = grid.getWorkspacePadding(Utilities.isRtl(getResources()));