| commit | 657c94298b737eb8ca06e9617021f91aa347cdad | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Tue Oct 29 16:22:49 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 29 16:22:49 2019 -0700 |
| tree | c39453cf5090b2bdfed7dc05918dc4d25c5e48cc | |
| parent | 00286967f2b0699e42b9da4e4a9dc28e5feadac8 [diff] | |
| parent | 95caf3907bcce5d30d8be89e9f23fe7513672818 [diff] |
Merge "Fix clock alpha when awake" into qt-qpr1-dev am: 5a7e009b8c am: 95caf3907b Change-Id: Ibb03a7dae910312bb29c9fede8a418dfa108cc45
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); }