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.

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"

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