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

Commit 13030fc0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[CS] Have SBNotifActivityStarter use KeyguardStateController#isOccluded." into udc-qpr-dev

parents 1ad38e26 8bd61cdd

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -280,7 +280,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
            mShadeController.addPostCollapseAction(runnable);

            mShadeController.addPostCollapseAction(runnable);

            mShadeController.collapseShade(true /* animate */);

            mShadeController.collapseShade(true /* animate */);

        } else if (mKeyguardStateController.isShowing()

        } else if (mKeyguardStateController.isShowing()

                && mCentralSurfaces.isOccluded()) {

                && mKeyguardStateController.isOccluded()) {

            mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);

            mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);

            mShadeController.collapseShade();

            mShadeController.collapseShade();

        } else {

        } else {

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -274,7 +274,7 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
        notification.flags |= Notification.FLAG_AUTO_CANCEL;

        notification.flags |= Notification.FLAG_AUTO_CANCEL;





        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mCentralSurfaces.isOccluded()).thenReturn(true);

        when(mKeyguardStateController.isOccluded()).thenReturn(true);





        // When

        // When

        mNotificationActivityStarter.onNotificationClicked(entry, mNotificationRow);

        mNotificationActivityStarter.onNotificationClicked(entry, mNotificationRow);
@@ -340,7 +340,7 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
        // Given

        // Given

        sbn.getNotification().contentIntent = null;

        sbn.getNotification().contentIntent = null;

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mCentralSurfaces.isOccluded()).thenReturn(true);

        when(mKeyguardStateController.isOccluded()).thenReturn(true);





        // When

        // When

        mNotificationActivityStarter.onNotificationClicked(entry, mBubbleNotificationRow);

        mNotificationActivityStarter.onNotificationClicked(entry, mBubbleNotificationRow);
@@ -368,7 +368,7 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
        // Given

        // Given

        sbn.getNotification().contentIntent = mContentIntent;

        sbn.getNotification().contentIntent = mContentIntent;

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mCentralSurfaces.isOccluded()).thenReturn(true);

        when(mKeyguardStateController.isOccluded()).thenReturn(true);





        // When

        // When

        mNotificationActivityStarter.onNotificationClicked(entry, mBubbleNotificationRow);

        mNotificationActivityStarter.onNotificationClicked(entry, mBubbleNotificationRow);