summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r--src/com/android/launcher3/Workspace.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e590779df..75bf26986 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3705,6 +3705,11 @@ public class Workspace extends SmoothPagedView
final int page = getNextPage() +
(direction == DragController.SCROLL_LEFT ? -1 : 1);
+ // Ensure that we are not dragging over to the custom content screen
+ if (getScreenIdForPageIndex(page) == CUSTOM_CONTENT_SCREEN_ID) {
+ return false;
+ }
+
// We always want to exit the current layout to ensure parity of enter / exit
setCurrentDropLayout(null);