commit 1fb0035acef67b99b197808158e0ac19f74d57af
author Jim Guggemos <jimg@google.com> Sat Feb 15 00:20:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Feb 15 00:20:30 2014 +0000
tree 7eac1d11d83b892cccadcd56e377a3223f0c31bd
parent 8c8abe936d21e95cf8f68689e750d56b6b98c04c
parent b608ae672d7ef85b85d9f45e7c36371c22ab8645

am b608ae67: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release

* commit 'b608ae672d7ef85b85d9f45e7c36371c22ab8645':
  Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)

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;
     }