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

Commit 25535243 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Ease out clock translation" into pi-dev

parents 2ca77fe9 0647d5b5
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ public class KeyguardClockPositionAlgorithm {
        float clockYTarget = mCurrentlySecure ? mMinTopMargin : -mKeyguardStatusHeight;

        // Move clock up while collapsing the shade
        final float shadeExpansion = mExpandedHeight / mMaxPanelHeight;
        float shadeExpansion = mExpandedHeight / mMaxPanelHeight;
        shadeExpansion = Interpolators.FAST_OUT_LINEAR_IN.getInterpolation(shadeExpansion);
        final float clockY = MathUtils.lerp(clockYTarget, clockYRegular, shadeExpansion);

        return (int) MathUtils.lerp(clockY, clockYDark, mDarkAmount);