From c36f2455aba21448a130b9a5e2a118a379745c37 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Wed, 10 Mar 2010 11:08:17 -0800
Subject: Cancel long press within normal touch slop, before paging touch slop.

Change-Id: I1b4d02db306bc0a7c3f39e2174a7239239ce4422
---
 src/com/android/launcher2/Workspace.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 00d3c0fda..d65a98cd6 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -616,12 +616,14 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
                 final int xDiff = (int) Math.abs(x - mLastMotionX);
                 final int yDiff = (int) Math.abs(y - mLastMotionY);
 
-                boolean xMoved = xDiff > mPagingTouchSlop;
-                boolean yMoved = yDiff > mTouchSlop;
+                final int touchSlop = mTouchSlop;
+                boolean xPaged = xDiff > mPagingTouchSlop;
+                boolean xMoved = xDiff > touchSlop;
+                boolean yMoved = yDiff > touchSlop;
                 
                 if (xMoved || yMoved) {
                     
-                    if (xMoved) {
+                    if (xPaged) {
                         // Scroll if the user moved far enough along the X axis
                         mTouchState = TOUCH_STATE_SCROLLING;
                         mLastMotionX = x;
-- 
cgit v1.2.3