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

Commit 10b6353f authored by Robert Snoeberger's avatar Robert Snoeberger
Browse files

Prevents large clock on AOD from overflowing top of screen. 

This works on AOD since notification icons were moved to
the status bar. For the lock screen, the clock is made
transparent due to the height of the clock. This prevents
the clock from interfering with the notifs in stack scroller.

Bug: b119103421
Test: KeyguardClockPositionAlgorithmTest updated.
Change-Id: Ife2de31ae6d55effced99c6d419c794ac57c8522
parent 57872e30

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