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
This commit is contained in:
Matt Pietal
2020-10-14 09:55:32 -04:00
parent 1af66d72f2
commit c29b75c58c

View File

@@ -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);
}