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

* commit 'c07347961e9c924aa042b9e1d3526e9b5e1c95ca': Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 13:30:53 -08:00
parent 025a5eec5a c07347961e
commit cecb23d30a
1 changed files with 10 additions and 1 deletions
@@ -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;
    }