diff options
| author | Shawn Lee <syeonlee@google.com> | 2023-04-17 15:05:23 -0700 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-14 02:45:19 +0000 |
| commit | fa49d0d53c6f5eab64128901b28e0104950d1cdd (patch) | |
| tree | 12aa8ec3b9cf3ce013030612b95fe5324cc85717 | |
| parent | c4d5c2ccf2f9fb8913f88f50e8a3ceb44f4c04f4 (diff) | |
| download | base-fa49d0d53c6f5eab64128901b28e0104950d1cdd.tar.gz | |
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 bef2be6757eec92391189c106e89b63176cd16c0)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e640447d16c4e893927e2f76bda8b1073bb18f8)
Merged-In: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 7388c27ed313..6cd0aee62551 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 906b9592e3dd..f6c260a875ea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -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()); |