commit 08ab8d28c659436966fd4afefb408dd0116ea6ff
author Winson Chung <winsonc@google.com> Wed Jul 31 17:31:16 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 31 17:31:17 2013 +0000
tree ed1b7a0d58e45f84404e3ff22667566de9e70f2a
parent df11a77f291b1fd6d1f9358c0a42d0621737d15a
parent 9883c9ae25a60b0be12f66f624a7eeff6781c175

Merge "Prevent dragging workspace items to custom content page." into jb-ub-gel-agar

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e590779..75bf269 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3705,6 +3705,11 @@
             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);