Merge "Fix clock alpha when awake" into qt-qpr1-dev
am: 5a7e009b8c
Change-Id: If52e7eae135f1c977d498fa22d297cb056b71a06
This commit is contained in:
@@ -240,7 +240,7 @@ public class KeyguardClockPositionAlgorithm {
|
|||||||
* @return Alpha from 0 to 1.
|
* @return Alpha from 0 to 1.
|
||||||
*/
|
*/
|
||||||
private float getClockAlpha(int y) {
|
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);
|
alphaKeyguard = Interpolators.ACCELERATE.getInterpolation(alphaKeyguard);
|
||||||
return MathUtils.lerp(alphaKeyguard, 1f, mDarkAmount);
|
return MathUtils.lerp(alphaKeyguard, 1f, mDarkAmount);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user