commit fa88b4502d92563c0a1a5444c044ba9248ed4fb1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 18 00:45:18 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 18 00:45:18 2023 +0000
tree 6832d7dd20f17d4a6990891a106cdd1eb9cbe838
parent 3eb9626bc03ad98119c2d2922c332bbf90c7c982
parent b5f473ed01329e6dd301fe84e049acc3a716a883

Merge "VelocityTracker should not be cleared until pointer up" into udc-dev

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: