Merge "Adding support for swipe and hold to overview from home screen to all-apps" into ub-launcher3-master
diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
index 34d04b5..b152bb9 100644
--- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -397,8 +397,10 @@
             // touch slop
             startTouchTrackingForWindowAnimation(ev.getEventTime());
         }
-        mPassedInitialSlop = true;
-        mStartDisplacement = getDisplacement(ev);
+        if (!mPassedInitialSlop) {
+            mPassedInitialSlop = true;
+            mStartDisplacement = getDisplacement(ev);
+        }
         notifyGestureStarted();
     }