From 1c8cb6fa773c8daecc864941f801b9578e38bebf Mon Sep 17 00:00:00 2001
From: Yura <yura@google.com>
Date: Tue, 4 Feb 2014 15:36:35 +0000
Subject: [PATCH 1/2] Missing paddingRight added.

Bug: 8166178
Change-Id: Ie2ba02a1ad85d29f1028fe021ade37975b453305
---
 res/layout-land/migration_workspace_cling.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml
index 2d71940757..1148be45f6 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"

From 4f93ec63b13f660fab63745d7127308954d5a6bd Mon Sep 17 00:00:00 2001
From: Yura <yura@google.com>
Date: Tue, 4 Feb 2014 14:15:21 +0000
Subject: [PATCH 2/2] Do not show overview when menu pressed on CustomContent
 screen.

Bug: 12524591
Change-Id: I2bc0c4d206214d994c9a9e1bd13b42f2e53dba9f
---
 src/com/android/launcher3/Launcher.java | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

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;
     }