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

Commit 6902bb32 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Centering clock on AOD in split shade mode 

Fixes: 201419264
Test: NotificationPanelViewControllerTest
Change-Id: If0742883b429b4537eb4033fce06c64a32de20a8
parent ccbf8e17

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

+4 −2
Original line number Diff line number Diff line
@@ -1385,8 +1385,10 @@ public class NotificationPanelViewController extends PanelViewController { 
        boolean bypassEnabled = mKeyguardBypassController.getBypassEnabled();

        final boolean hasVisibleNotifications = mNotificationStackScrollLayoutController

                .getVisibleNotificationCount() != 0 || mMediaDataManager.hasActiveMedia();

        boolean splitShadeWithActiveMedia =

                mShouldUseSplitNotificationShade && mMediaDataManager.hasActiveMedia();

        if ((hasVisibleNotifications && !mShouldUseSplitNotificationShade)

                || (mShouldUseSplitNotificationShade && mMediaDataManager.hasActiveMedia())) {

                || (splitShadeWithActiveMedia && !mDozing)) {

            mKeyguardStatusViewController.displayClock(SMALL);

        } else {

            mKeyguardStatusViewController.displayClock(LARGE);
@@ -1450,7 +1452,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                .getVisibleNotificationCount() != 0 || mMediaDataManager.hasActiveMedia();

        boolean hasCommunalSurface = mCommunalSource != null && mCommunalSource.get() != null;

        boolean shouldBeCentered = !mShouldUseSplitNotificationShade

                || (!hasVisibleNotifications && !hasCommunalSurface);

                || (!hasVisibleNotifications && !hasCommunalSurface) || mDozing;

        if (mStatusViewCentered != shouldBeCentered) {

            mStatusViewCentered = shouldBeCentered;

            ConstraintSet constraintSet = new ConstraintSet();

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

+12 −0
Original line number Diff line number Diff line
@@ -844,6 +844,18 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        verify(mKeyguardStatusViewController, never()).displayClock(SMALL);

    }



    @Test

    public void testSwitchesToBigClockInSplitShadeOnAod() {

        mStatusBarStateController.setState(KEYGUARD);

        enableSplitShade(/* enabled= */ true);

        when(mMediaDataManager.hasActiveMedia()).thenReturn(true);

        when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(2);



        mNotificationPanelViewController.setDozing(true, false, null);



        verify(mKeyguardStatusViewController).displayClock(LARGE);

    }



    @Test

    public void testDisplaysSmallClockOnLockscreenInSplitShadeWhenMediaIsPlaying() {

        mStatusBarStateController.setState(KEYGUARD);