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

Commit f9727309 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Ease out clock translation" into pi-dev 

am: 25535243

Change-Id: I8585652bf8c5dfd05c74fc0917dd883dc9475cd0
parents 1bccf3e7 25535243

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java

+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);