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

Commit 1f172ff7 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Showing small lockscreen clock when media player visible in split shade" into sc-v2-dev

parents da634dae e79a41ac

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

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

        final boolean hasVisibleNotifications = mNotificationStackScrollLayoutController

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

        if (hasVisibleNotifications && !mShouldUseSplitNotificationShade) {

        if ((hasVisibleNotifications && !mShouldUseSplitNotificationShade)

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

            mKeyguardStatusViewController.displayClock(SMALL);

        } else {

            mKeyguardStatusViewController.displayClock(LARGE);

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

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

    }



    @Test

    public void testDisplaysSmallClockOnLockscreenInSplitShadeWhenMediaIsPlaying() {

        mStatusBarStateController.setState(KEYGUARD);

        enableSplitShade();

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



        // one notification + media player visible

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

        triggerPositionClockAndNotifications();

        verify(mKeyguardStatusViewController).displayClock(SMALL);



        // only media player visible

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

        triggerPositionClockAndNotifications();

        verify(mKeyguardStatusViewController, times(2)).displayClock(SMALL);

        verify(mKeyguardStatusViewController, never()).displayClock(LARGE);

    }



    private void triggerPositionClockAndNotifications() {

        mNotificationPanelViewController.closeQs();

    }