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

am: 76bf35f6b2

Change-Id: I7c1fe05e5b75094d45012c4d3ae0fc47d7f27c24
This commit is contained in:
Robert Snoeberger
2019-06-12 14:28:44 -07:00
committed by android-build-merger

View File

@@ -94,7 +94,8 @@ public class ClockLayout extends FrameLayout {
getBurnInOffset(mBurnInPreventionOffsetX * 2, true) - mBurnInPreventionOffsetX, getBurnInOffset(mBurnInPreventionOffsetX * 2, true) - mBurnInPreventionOffsetX,
mDarkAmount); mDarkAmount);
final float offsetY = MathUtils.lerp(0f, final float offsetY = MathUtils.lerp(0f,
getBurnInOffset(mBurnInPreventionOffsetY * 2, false) - mBurnInPreventionOffsetY, getBurnInOffset(mBurnInPreventionOffsetY * 2, false)
- 0.5f * mBurnInPreventionOffsetY,
mDarkAmount); mDarkAmount);
// Put the analog clock in the middle of the screen. // Put the analog clock in the middle of the screen.