diff options
author | Adam Skory <skory@google.com> | 2014-03-20 01:12:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 01:12:53 +0000 |
commit | 78d8510a20be87fb4236e93e1a1c4163047151fc (patch) | |
tree | 545389cee63291905c8340403da06e38314ff1a6 | |
parent | 77ef6b2b5d30713eecd1509f43527f728bad08dc (diff) | |
parent | 9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40 (diff) | |
download | android_packages_apps_Trebuchet-78d8510a20be87fb4236e93e1a1c4163047151fc.tar.gz android_packages_apps_Trebuchet-78d8510a20be87fb4236e93e1a1c4163047151fc.tar.bz2 android_packages_apps_Trebuchet-78d8510a20be87fb4236e93e1a1c4163047151fc.zip |
am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
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; } |