diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 70d44cee40..13507c6223 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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; }