commit 0877aabf28073cf56f4e837d702a75111f12ac61
author Robert Snoeberger <snoeberger@google.com> Tue Jun 11 16:48:41 2019 -0400
committer Robert Snoeberger <snoeberger@google.com> Tue Jun 11 20:59:36 2019 +0000
tree 2cd9590c253109434c87b985826ed21b6777918b
parent cd7cd3fd541f9eb7100ae4c6b7009f57f52529c3

Reduce overlap of analog clock with smart space.

To reduce overlap, this change biases offset to positive Y so that the
clock remains lower on the screen. Note that this doesn't prevent
overlap. It only helps reduce it.

Bug: 133188468
Test: collected screenshots over accelerated 24 hrs and looked for
overlap.

Change-Id: Ib6bdc19a5c93af2cd5df8400e2fa3106c281acf9

packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java

diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java b/packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java
index 1908345..7485d33 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java
@@ -94,7 +94,8 @@
                 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.