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)
2014-01-17 13:28:54 -08:00
parent f3a8e8c0bd e6e0af03ee
commit c07347961e
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;
    }