From c29b75c58c7d9009a1e9732a081767d64f3ba907 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Wed, 14 Oct 2020 09:55:32 -0400 Subject: Lockscreen - AOD layout adjustments Make sure the clock/smart space stay top-aligned on AOD Bug: 170729566 Test: adb shell settings put global show_new_lockscreen 1 Change-Id: I8fcda941a0e012196ad310198388938e0af3a51f --- .../statusbar/phone/KeyguardClockPositionAlgorithm.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java index 1fdf631a858d..ef4108b9762d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java @@ -175,8 +175,8 @@ public class KeyguardClockPositionAlgorithm { } /** - * Update lock screen mode for testing different layouts - */ + * Update lock screen mode for testing different layouts + */ public void onLockScreenModeChanged(int mode) { mLockScreenMode = mode; } @@ -241,6 +241,13 @@ public class KeyguardClockPositionAlgorithm { clockYDark = MathUtils.lerp(clockYBouncer, clockYDark, shadeExpansion); float darkAmount = mBypassEnabled && !mHasCustomClock ? 1.0f : mDarkAmount; + + // TODO(b/12836565) - prototyping only adjustment + if (mLockScreenMode != KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL) { + // This will keep the clock at the top for AOD + darkAmount = 0f; + } + return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mEmptyDragAmount); } -- cgit v1.2.3-59-g8ed1b