Merge "Fix clock alpha when awake" into qt-qpr1-dev (5a7e009b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}