commit e0fa7da5aaec2d3e11a07ceb8710d4e9f4e9a47c
author George Mount <mount@google.com> Fri Jun 04 18:16:13 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 04 18:16:13 2021 +0000
tree 28aa86af868df5966f68f08dafa1ed0a740ab7af
parent 1746c1e3302725d838fbd2e03c4363000e033c61
parent 60dd581ac23db86456cd1a7dcbb82cf089e55a94

Merge "Fix ListView not moving during catch" into sc-dev

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 5e2209e..721260e 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -4575,7 +4575,7 @@
                 int motionPosition = findMotionRow(y);
                 if (isGlowActive()) {
                     // Pressed during edge effect, so this is considered the same as a fling catch.
-                    mTouchMode = TOUCH_MODE_FLING;
+                    touchMode = mTouchMode = TOUCH_MODE_FLING;
                 } else if (touchMode != TOUCH_MODE_FLING && motionPosition >= 0) {
                     // User clicked on an actual view (and was not stopping a fling).
                     // Remember where the motion event started