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

Commit 2d628c1c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Limit overscroll stretch for animation" into sc-dev am: b42f19e2 

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

Change-Id: I249a27030e5cd0375bc4e57e89528675557bcd1e
parents af5cbff3 b42f19e2

core/java/android/widget/EdgeEffect.java

+8 −0
Original line number Diff line number Diff line
@@ -365,6 +365,10 @@ public class EdgeEffect { 
        mDuration = PULL_TIME;



        mPullDistance += deltaDistance;

        if (edgeEffectBehavior == TYPE_STRETCH) {

            // Don't allow stretch beyond 1

            mPullDistance = Math.min(1f, mPullDistance);

        }

        mDistance = Math.max(0f, mPullDistance);

        mVelocity = 0;
@@ -783,6 +787,10 @@ public class EdgeEffect { 
                + mDampedFreq * sinCoeff * Math.cos(mDampedFreq * deltaT));

        mDistance = (float) distance / mHeight;

        mVelocity = (float) velocity;

        if (mDistance > 1f) {

            mDistance = 1f;

            mVelocity = 0f;

        }

        if (isAtEquilibrium()) {

            mDistance = 0;

            mVelocity = 0;