Let spring take over the overscroll amount when swiping to first/last page.

Bug: 153747836 Change-Id: I8a883f648587b0cb4008df3b8176c9341162b8d1
2020-04-10 13:38:14 -07:00
parent 0c0a9ae366
commit 57dab6fa29
3 changed files with 22 additions and 9 deletions
@@ -561,10 +561,11 @@ public class OverScroller {
            mStartTime = AnimationUtils.currentAnimationTimeMillis();
            mDuration = duration;

+            if (mSpring != null) {
+                mSpring.cancel();
+            }
+
            if (mState == SPRING) {
-                if (mSpring != null) {
-                    mSpring.cancel();
-                }
                mSpring = new SpringAnimation(this, SPRING_PROPERTY);

                ResourceProvider rp = DynamicResource.provider(mContext);
@@ -576,9 +577,9 @@ public class OverScroller {
                mSpring.setStartVelocity(velocity);
                mSpring.animateToFinalPosition(mFinal);
                mSpring.addEndListener((animation, canceled, value, velocity1) -> {
+                    mSpring = null;
                    finish();
                    mState = SPLINE;
-                    mSpring = null;
                });
            }
            // Unused