commit e67ccac004416d78d37968f60fe68f3bac6d33c1
author Adam Cohen <adamcohen@google.com> Sun Sep 22 19:34:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 22 19:34:40 2013 +0000
tree edaea1d533ee5437a70749b9cb5eaf0c67c8307f
parent 49ff36f1f12be127034ee59a27ed80e35cf36117
parent df041bc7ad99a6d33a5dd83a5dff28a617fedf12

Merge "Fix issue where you could page to -1 during spring loaded drag (issue 10640529)" into jb-ub-now-indigo-rose

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 67d66f4..8cf2c41 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2950,6 +2950,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};