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

Commit c3dd25c3 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Hide EmptyShadeView when on bouncer" into udc-dev am: 5541e3bc am: 0323ba72 

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



Change-Id: I654e408d259a10764943b3484f96adff8fb3810f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3972f96c 0323ba72

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −0
Original line number Diff line number Diff line
@@ -2809,6 +2809,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    @Override

    public void setBouncerShowing(boolean bouncerShowing) {

        mBouncerShowing = bouncerShowing;

        mNotificationStackScrollLayoutController.updateShowEmptyShadeView();

        updateVisibility();

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+2 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,8 @@ public class NotificationStackScrollLayoutController { 
                // Hide empty shade view when in transition to Keyguard.

                // That avoids "No Notifications" to blink when transitioning to AOD.

                // For more details, see: b/228790482

                && !isInTransitionToKeyguard();

                && !isInTransitionToKeyguard()

                && !mCentralSurfaces.isBouncerShowing();



        mView.updateEmptyShadeView(shouldShow, mZenModeController.areNotificationsHiddenInShade());