| commit | 95caf3907bcce5d30d8be89e9f23fe7513672818 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Tue Oct 29 16:15:23 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 29 16:15:23 2019 -0700 |
| tree | 8ccd471a142ccd4f06047ea6a7a8f3743b6eed15 | |
| parent | 3a6f4226ca197c11937b21c37fcdb79410c2bce0 [diff] | |
| parent | 5a7e009b8c9c9d4fec5cc4c780137421d1f3f3b7 [diff] |
Merge "Fix clock alpha when awake" into qt-qpr1-dev am: 5a7e009b8c Change-Id: If52e7eae135f1c977d498fa22d297cb056b71a06
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 179375e..4e91e4c 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 @@ * @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); }