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

Commit 1f362453 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[CS] Have SBNotifActivityStarter use... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983996



Change-Id: I56d2414d184b37a8cc6667cd4fb4a5bbd2ddd066
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d72e2eb 13030fc0

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);