am 4f93ec63: Do not show overview when menu pressed on CustomContent screen.

* commit '4f93ec63b13f660fab63745d7127308954d5a6bd': Do not show overview when menu pressed on CustomContent screen.
2014-02-04 08:36:58 -08:00
parent eb1658bc8c 4f93ec63b1
commit f7bc687e6e
1 changed files with 15 additions and 9 deletions
@@ -2044,18 +2044,24 @@ public class Launcher extends Activity
        }
    }

+    public boolean isOnCustomContent() {
+        return mWorkspace.isOnOrMovingToCustomContent();
+    }
+
    @Override
    public boolean onPrepareOptionsMenu(Menu menu) {
        super.onPrepareOptionsMenu(menu);
-        // Close any open folders
-        closeFolder();
-        // Stop resizing any widgets
-        mWorkspace.exitWidgetResizeMode();
-        if (!mWorkspace.isInOverviewMode()) {
-            // Show the overview mode
-            showOverviewMode(true);
-        } else {
-            showWorkspace(true);
+        if (!isOnCustomContent()) {
+            // 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;
    }