From df041bc7ad99a6d33a5dd83a5dff28a617fedf12 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sun, 22 Sep 2013 12:32:22 -0700
Subject: Fix issue where you could page to -1 during spring loaded drag (issue
 10640529)

Change-Id: I487c871af4ec4412ee4edc74ce58947e54ccd43b
---
 src/com/android/launcher3/Workspace.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com/android/launcher3/Workspace.java')

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 4dca5997a..9dfe18ba2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2951,6 +2951,11 @@ public class Workspace extends SmoothPagedView
         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};
-- 
cgit v1.2.3