Merge "Fix clock alpha when awake" into qt-qpr1-dev

am: 5a7e009b8c Change-Id: If52e7eae135f1c977d498fa22d297cb056b71a06
2019-10-29 16:15:23 -07:00
parent 3a6f4226ca 5a7e009b8c
commit 95caf3907b
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
@@ -240,7 +240,7 @@ public class KeyguardClockPositionAlgorithm {
     * @return Alpha from 0 to 1.
     */
    private float getClockAlpha(int y) {
-        float alphaKeyguard = Math.max(0, y / Math.max(1f, getExpandedPreferredClockY()));
+        float alphaKeyguard = Math.max(0, y / Math.max(1f, getClockY(1f)));
        alphaKeyguard = Interpolators.ACCELERATE.getInterpolation(alphaKeyguard);
        return MathUtils.lerp(alphaKeyguard, 1f, mDarkAmount);
    }