diff options
| author | Adam Skory <skory@google.com> | 2014-03-20 01:18:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 01:18:37 +0000 |
| commit | fbcdfa31de4f6d1bcb3122efd38f0b67a2f7bdac (patch) | |
| tree | 5c37da21ce33c8c5918c22b888bf526432e4629c | |
| parent | 1f74f878aa06d2dee20e34bed21fc01581712748 (diff) | |
| parent | 78d8510a20be87fb4236e93e1a1c4163047151fc (diff) | |
| download | android_packages_apps_Trebuchet-fbcdfa31de4f6d1bcb3122efd38f0b67a2f7bdac.tar.gz android_packages_apps_Trebuchet-fbcdfa31de4f6d1bcb3122efd38f0b67a2f7bdac.tar.bz2 android_packages_apps_Trebuchet-fbcdfa31de4f6d1bcb3122efd38f0b67a2f7bdac.zip | |
am 78d8510a: am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '78d8510a20be87fb4236e93e1a1c4163047151fc':
Do not show overview when menu pressed on CustomContent screen.
Missing paddingRight added.
| -rw-r--r-- | res/layout-land/migration_workspace_cling.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 24 |
2 files changed, 16 insertions, 9 deletions
diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml index 2d7194075..1148be45f 100644 --- a/res/layout-land/migration_workspace_cling.xml +++ b/res/layout-land/migration_workspace_cling.xml @@ -25,6 +25,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|center_vertical" android:paddingEnd="60dp" + android:paddingRight="60dp" android:orientation="vertical"> <LinearLayout android:id="@+id/migration_workspace_cling_bubble" diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 70d44cee4..13507c622 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; } |