commit 79c905d18ad21552699c77c943d8bc81eaeb01d3
author Adam Cohen <adamcohen@google.com> Mon Jun 03 12:39:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 12:39:34 2019 -0700
tree fb5d0d7ad0bc46c2839b1aa21fa0efcf556336f2
parent 1d2acc1a67eb794cb3eebc5f74ed7dc1d471573c
parent 80ed6012ddad9af65ced8b651c0356d9cfd87ee6

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

Change-Id: I8816a17d486ba69ed372310a6e1fac0ecddddaf4

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;
     }