commit b5f473ed01329e6dd301fe84e049acc3a716a883
author George Mount <mount@google.com> Fri Apr 14 10:23:00 2023 -0700
committer George Mount <mount@google.com> Fri Apr 14 16:37:05 2023 -0700
tree 2f0d557cfd53d233b6826a9dd954b1d1da9b96f7
parent 011d00e117df7145428fb82d177e713595183185

VelocityTracker should not be cleared until pointer up

Fixes: 266736911

VelocityTracker was being cleared when it hit the end
of the View, but stretch overscroll can be flung.

Test: ScrollViewTest

Change-Id: Iadeca98360dc5a5462bcefbdd266bca92c0b6d5a

core/java/android/widget/ScrollView.java

diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index a5e7086..b65c1a1 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -845,11 +845,7 @@
 
                     // Calling overScrollBy will call onOverScrolled, which
                     // calls onScrollChanged if applicable.
-                    if (overScrollBy(0, deltaY, 0, mScrollY, 0, range, 0, mOverscrollDistance, true)
-                            && !hasNestedScrollingParent()) {
-                        // Break our velocity if we hit a scroll barrier.
-                        mVelocityTracker.clear();
-                    }
+                    overScrollBy(0, deltaY, 0, mScrollY, 0, range, 0, mOverscrollDistance, true);
 
                     final int scrolledDeltaY = mScrollY - oldY;
                     final int unconsumedY = deltaY - scrolledDeltaY;
@@ -894,6 +890,7 @@
 
                     mActivePointerId = INVALID_POINTER;
                     endDrag();
+                    velocityTracker.clear();
                 }
                 break;
             case MotionEvent.ACTION_CANCEL: