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

Commit 3b86d10b authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Slightly adjust spring force for 3-button-nav predictive back" into main

parents 9664a1c8 42902e3f

core/java/android/window/BackProgressAnimator.java

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class BackProgressAnimator implements DynamicAnimation.OnAnimationUpdateL 
     */

    private static final float SCALE_FACTOR = 100f;

    private static final float FLING_FRICTION = 8f;

    private static final float BUTTON_SPRING_STIFFNESS = 100;

    private final SpringAnimation mSpring;

    private ProgressCallback mCallback;

    private float mProgress = 0;
@@ -156,7 +157,7 @@ public class BackProgressAnimator implements DynamicAnimation.OnAnimationUpdateL 
                /* frameTime */ System.nanoTime() / TimeUtils.NANOS_PER_MS);

        if (predictiveBackSwipeEdgeNoneApi()) {

            if (event.getSwipeEdge() == EDGE_NONE) {

                mButtonSpringForce.setStiffness(SpringForce.STIFFNESS_LOW);

                mButtonSpringForce.setStiffness(BUTTON_SPRING_STIFFNESS);

                mSpring.setSpring(mButtonSpringForce);

                mSpring.animateToFinalPosition(SCALE_FACTOR);

            } else {