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

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

Merge "Centering clock on AOD in split shade mode" into sc-v2-dev

parents 4d7624e9 94a8f252

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

+5 −2
Original line number Diff line number Diff line
@@ -1256,8 +1256,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);
@@ -1319,7 +1321,8 @@ public class NotificationPanelViewController extends PanelViewController { 
    private void updateKeyguardStatusViewAlignment(boolean animate) {

        boolean hasVisibleNotifications = mNotificationStackScrollLayoutController

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

        boolean shouldBeCentered = !mShouldUseSplitNotificationShade || !hasVisibleNotifications;

        boolean shouldBeCentered =

                !mShouldUseSplitNotificationShade || !hasVisibleNotifications || 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
@@ -777,6 +777,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);