summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2021-06-04 18:16:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-06-04 18:16:13 +0000
commite0fa7da5aaec2d3e11a07ceb8710d4e9f4e9a47c (patch)
tree28aa86af868df5966f68f08dafa1ed0a740ab7af /core/java
parent1746c1e3302725d838fbd2e03c4363000e033c61 (diff)
parent60dd581ac23db86456cd1a7dcbb82cf089e55a94 (diff)
Merge "Fix ListView not moving during catch" into sc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/AbsListView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 5e2209e65f45..721260e8cafe 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -4575,7 +4575,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
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