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

am: 76bf35f6b2 Change-Id: I7c1fe05e5b75094d45012c4d3ae0fc47d7f27c24
2019-06-12 14:28:44 -07:00
parent 9691da7a28 76bf35f6b2
commit 41e4ccabdd
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.