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

Commit 80b08509 authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer" into tm-qpr-dev

parents ab7941d8 2e640447

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

+1 −0
Original line number Diff line number Diff line
@@ -2843,6 +2843,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    /** Set whether the bouncer is showing. */

    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
@@ -1240,7 +1240,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());