am e6e0af03: Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit

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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4d0349bed..503cc6a01 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2053,7 +2053,16 @@ public class Launcher extends Activity
     @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;
     }