diff options
| author | Yura <yura@google.com> | 2014-02-04 14:15:21 +0000 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:27 -0700 |
| commit | 4f797884a3cb39f1dd192af8464cf41cb1b71073 (patch) | |
| tree | 961273b9000571f2d1233ae346d6f20cbecf7bce /src/com/android | |
| parent | 62fef26ad442a0af87a918517059652e3f7f39cf (diff) | |
| download | android_packages_apps_Trebuchet-4f797884a3cb39f1dd192af8464cf41cb1b71073.tar.gz android_packages_apps_Trebuchet-4f797884a3cb39f1dd192af8464cf41cb1b71073.tar.bz2 android_packages_apps_Trebuchet-4f797884a3cb39f1dd192af8464cf41cb1b71073.zip | |
Do not show overview when menu pressed on CustomContent screen.
Bug: 12524591
Change-Id: I2bc0c4d206214d994c9a9e1bd13b42f2e53dba9f
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d4bd30169..b775c08ea 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2224,18 +2224,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; } |