commit 80ed6012ddad9af65ced8b651c0356d9cfd87ee6
author Adam Cohen <adamcohen@google.com> Mon Jun 03 12:34:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 12:34:31 2019 -0700
tree 18c2b1f28633b9287812dfbcc0556550792bc3fa
parent dcff2f18750be17537f659c7175b3f26c4fbdb34
parent acdde3d750611476264a838d0a536d99404a692b

Fix issue where Workspace scrolling doesn't work
am: acdde3d750

Change-Id: If949e3368d383b8a7ba1c6c7608af46011f36f73

src/com/android/launcher3/touch/WorkspaceTouchListener.java

diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
index 07ddccb..310d598 100644
--- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java
+++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
@@ -99,7 +99,6 @@
                 handleLongPress = mTempRect.contains((int) ev.getX(), (int) ev.getY());
             }
 
-            cancelLongPress();
             if (handleLongPress) {
                 mLongPressState = STATE_REQUESTED;
                 mTouchDownPoint.set(ev.getX(), ev.getY());
@@ -148,6 +147,10 @@
             }
         }
 
+        if (action == ACTION_UP || action == ACTION_CANCEL) {
+            cancelLongPress();
+        }
+
         return result;
     }