Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release

at e6e0af03ee
2014-01-17 13:58:40 -07:00
parent 8ffe7b76ac e6e0af03ee
commit b608ae672d
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;
    }