Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fe3e8ff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "VelocityTracker should not be cleared until pointer up" into udc-dev am: fa88b450 am: d813852c

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



Change-Id: I7278b527c9169b474f6f32c6b9cffe359caebfd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03d5e054 d813852c

core/java/android/widget/ScrollView.java

+2 −5
Original line number Diff line number Diff line
@@ -845,11 +845,7 @@ public class ScrollView extends FrameLayout { 


                    // 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 @@ public class ScrollView extends FrameLayout { 


                    mActivePointerId = INVALID_POINTER;

                    endDrag();

                    velocityTracker.clear();

                }

                break;

            case MotionEvent.ACTION_CANCEL: