Merge "Ease out clock translation" into pi-dev

This commit is contained in:
Lucas Dupin
2018-03-20 03:31:00 +00:00
committed by Android (Google) Code Review

View File

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