Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd5f1a31 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevents large clock on AOD from overflowing top of screen."

parents db96674e 10b6353f

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

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ public class KeyguardClockPositionAlgorithm { 
        if (mPulsing) {

            clockYDark -= mPulsingPadding;

        }

        clockYDark = MathUtils.max(0, clockYDark);



        float clockYRegular = getExpandedClockPosition();

        float clockYBouncer = -mKeyguardStatusHeight;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ public class KeyguardClockPositionAlgorithmTest extends SysuiTestCase { 
        mKeyguardStatusHeight = SCREEN_HEIGHT;

        // WHEN the clock position algorithm is run

        positionClock();

        // THEN the clock Y position overflows the parent.

        assertThat(mClockPosition.clockY).isEqualTo(-1000);

        // THEN the clock Y position doesn't overflow the screen.

        assertThat(mClockPosition.clockY).isEqualTo(0);

        // AND the clock is opaque and positioned on the left.

        assertThat(mClockPosition.clockX).isEqualTo(0);

        assertThat(mClockPosition.clockAlpha).isEqualTo(OPAQUE);