Merge "Only fade clock away at the top of the screen" into pi-dev

2018-04-17 00:14:22 +00:00
parent d7732b4c8a e9526a9836
commit 34a0b18a5c
1 changed files with 1 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
@@ -232,8 +232,7 @@ public class KeyguardClockPositionAlgorithm {
        if (mCurrentlySecure) {
            alphaKeyguard = 1;
        } else {
-            alphaKeyguard = Math.max(0, Math.min(1, (y - mMinTopMargin)
-                    / Math.max(1f, getExpandedClockPosition() - mMinTopMargin)));
+            alphaKeyguard = Math.max(0, y / Math.max(1f, getExpandedClockPosition()));
            alphaKeyguard = Interpolators.ACCELERATE.getInterpolation(alphaKeyguard);
        }
        return MathUtils.lerp(alphaKeyguard, 1f, mDarkAmount);