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

Commit 8bd61cdd authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Have SBNotifActivityStarter use KeyguardStateController#isOccluded. 

CentralSurfacesImpl#isOccluded just delegates to KeyguardStateController
under-the-hood, so the activity starter can use KSC directly.

Bug: 277764509
Test: manual: verified via logging that SBNAS receives correct
isOccluded value when a notification is clicked (true if HUN appears on
top of occluding activity like camera, false otherwise)

Test: atest StatusBarNotificationActivityStarterTest
Change-Id: If9d37bd308306a36ea296688406436b6511da26a
parent e6ac1838

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

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

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

        } else if (mKeyguardStateController.isShowing()

                && mCentralSurfaces.isOccluded()) {

                && mKeyguardStateController.isOccluded()) {

            mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);

            mShadeController.collapseShade();

        } else {

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

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



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

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

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



        // When

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

        sbn.getNotification().contentIntent = null;

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

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

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



        // When

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

        sbn.getNotification().contentIntent = mContentIntent;

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

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

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



        // When

        mNotificationActivityStarter.onNotificationClicked(entry, mBubbleNotificationRow);