Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ease out clock translation" into pi-dev

Browse Source 
am: 255352437f

Change-Id: I8585652bf8c5dfd05c74fc0917dd883dc9475cd0
This commit is contained in:
Lucas Dupin
2018-03-20 05:15:17 +00:00
committed by android-build-merger
parent 1bccf3e781 255352437f
commit f9727309c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
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);