From df4ee3cda5da2dbc4c8a4b00aae9307bc2264203 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Mon, 21 Oct 2019 15:56:55 -0700 Subject: [PATCH] Fix clock alpha when awake Test: manual Test: atest KeyguardClockPositionAlgorithmTest Fixes: 141545917 Change-Id: I961a208313f7697913c90e8d0eedb8c940a29b04 --- .../statusbar/phone/KeyguardClockPositionAlgorithm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java index 179375e31dd38..4e91e4c84e992 100644 --- 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); }