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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14829811

Change-Id: Ia76a53ca5a0591ca67a0fbd43a8653b7eb9d04c3
This commit is contained in:
George Mount
2021-06-04 18:29:22 +00:00
committed by Automerger Merge Worker

View File

@@ -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