commit df041bc7ad99a6d33a5dd83a5dff28a617fedf12
author Adam Cohen <adamcohen@google.com> Sun Sep 22 12:32:22 2013 -0700
committer Adam Cohen <adamcohen@google.com> Sun Sep 22 12:33:36 2013 -0700
tree 4a2563899f2b9da1f854fee1e4b2c8af97d8d15e
parent 89f9705077c054b541af7da52be832760e2ae2e8

Fix issue where you could page to -1 during spring loaded drag (issue 10640529)

Change-Id: I487c871af4ec4412ee4edc74ce58947e54ccd43b

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 4dca599..9dfe18b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2951,6 +2951,11 @@
         float smallestDistSoFar = Float.MAX_VALUE;
 
         for (int i = 0; i < screenCount; i++) {
+            // The custom content screen is not a valid drag over option
+            if (mScreenOrder.get(i) == CUSTOM_CONTENT_SCREEN_ID) {
+                continue;
+            }
+
             CellLayout cl = (CellLayout) getChildAt(i);
 
             final float[] touchXy = {originX, originY};