Merge "Reduce overlap of analog clock with smart space." into qt-r1-dev am: 76bf35f6b2

am: 41e4ccabdd Change-Id: I3f4510c351fea15c0014bc90f7d375ebd6485dd6
2019-06-12 14:53:06 -07:00
parent 4e0dffbcad 41e4ccabdd
commit fd6a5b2c72
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java
@@ -94,7 +94,8 @@ public class ClockLayout extends FrameLayout {
                getBurnInOffset(mBurnInPreventionOffsetX * 2, true) - mBurnInPreventionOffsetX,
                mDarkAmount);
        final float offsetY = MathUtils.lerp(0f,
-                getBurnInOffset(mBurnInPreventionOffsetY * 2, false) - mBurnInPreventionOffsetY,
+                getBurnInOffset(mBurnInPreventionOffsetY * 2, false)
+                        - 0.5f * mBurnInPreventionOffsetY,
                mDarkAmount);

        // Put the analog clock in the middle of the screen.