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

Commit f99891ab authored by Shawn Lee's avatar Shawn Lee Committed by Android Build Coastguard Worker
Browse files

DO NOT MERGE Hide EmptyShadeView when on bouncer 

Added a check to make sure EmptyShadeView is hidden when bouncer is showing.

Bug: 267060171
Test: manually verified EmptyShadeView visibility
(cherry picked from commit bef2be67)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e640447d16c4e893927e2f76bda8b1073bb18f8)
Merged-In: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
parent ba16c9f5

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