commit 5ac62d6914067c48e1fcdb3f6f149532017c5803
author Adam Cohen <adamcohen@google.com> Fri Jan 17 22:32:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 17 22:32:22 2014 +0000
tree 51649cbd2335e4cfecf7e6dbe7d628880c355aa8
parent e6e0af03ee39b3e800c8f7e86eefffae432ee7c8
parent efb31e399d335351a8db3de54ed66fabd30606ba

Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 61a594f..9a16037 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2053,7 +2053,16 @@
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        showOverviewMode(true);
+        // Close any open folders
+        closeFolder();
+        // Stop resizing any widgets
+        mWorkspace.exitWidgetResizeMode();
+        if (!mWorkspace.isInOverviewMode()) {
+            // Show the overview mode
+            showOverviewMode(true);
+        } else {
+            showWorkspace(true);
+        }
         return false;
     }