Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev

Browse Source
This commit is contained in:
Robert Snoeberger
2019-06-04 20:38:17 +00:00
committed by Android (Google) Code Review
parent 01d0acfed0 2f33abb673
commit 30a416fdea
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/keyguard/clock/SmallClockPosition.java
View File

@@ -67,7 +67,8 @@ class SmallClockPosition {
*/ */
int getPreferredY() { int getPreferredY() {
// On AOD, clock needs to appear below the status bar with enough room for pixel shifting // On AOD, clock needs to appear below the status bar with enough room for pixel shifting
int aodY = mStatusBarHeight + mKeyguardLockPadding + mBurnInOffsetY; int aodY = mStatusBarHeight + mKeyguardLockHeight + 2 * mKeyguardLockPadding
+ mBurnInOffsetY;
// On lock screen, clock needs to appear below the lock icon // On lock screen, clock needs to appear below the lock icon
int lockY = mStatusBarHeight + mKeyguardLockHeight + 2 * mKeyguardLockPadding; int lockY = mStatusBarHeight + mKeyguardLockHeight + 2 * mKeyguardLockPadding;
return (int) MathUtils.lerp(lockY, aodY, mDarkAmount); return (int) MathUtils.lerp(lockY, aodY, mDarkAmount);

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
View File

@@ -176,7 +176,7 @@ public class KeyguardClockPositionAlgorithm {
} }
private int getExpandedPreferredClockY() { private int getExpandedPreferredClockY() {
return (mHasCustomClock && !mHasVisibleNotifs) ? getPreferredClockY() return (mHasCustomClock && (!mHasVisibleNotifs || mPositionLikeDark)) ? getPreferredClockY()
: getExpandedClockPosition(); : getExpandedClockPosition();
} }
@@ -218,7 +218,7 @@ public class KeyguardClockPositionAlgorithm {
float clockY = MathUtils.lerp(clockYBouncer, clockYRegular, shadeExpansion); float clockY = MathUtils.lerp(clockYBouncer, clockYRegular, shadeExpansion);
clockYDark = MathUtils.lerp(clockYBouncer, clockYDark, shadeExpansion); clockYDark = MathUtils.lerp(clockYBouncer, clockYDark, shadeExpansion);
float darkAmount = mPositionLikeDark ? 1.0f : mDarkAmount; float darkAmount = mPositionLikeDark && !mHasCustomClock ? 1.0f : mDarkAmount;
return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mEmptyDragAmount); return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mEmptyDragAmount);
} }

6
packages/SystemUI/tests/src/com/android/keyguard/clock/SmallClockPositionTest.kt
View File

@@ -52,8 +52,8 @@ class SmallClockPositionTest : SysuiTestCase() {
fun darkPosition() { fun darkPosition() {
// GIVEN on AOD // GIVEN on AOD
position.setDarkAmount(1f) position.setDarkAmount(1f)
// THEN Y position is statusBarHeight + lockPadding + burnInY (100 + 15 + 20 = 135) // THEN Y is sum of statusBarHeight, lockPadding, lockHeight, lockPadding, burnInY
assertThat(position.preferredY).isEqualTo(135) assertThat(position.preferredY).isEqualTo(185)
} }
@Test @Test
@@ -64,4 +64,4 @@ class SmallClockPositionTest : SysuiTestCase() {
// (100 + 15 + 35 + 15 = 165) // (100 + 15 + 35 + 15 = 165)
assertThat(position.preferredY).isEqualTo(165) assertThat(position.preferredY).isEqualTo(165)
} }
} }