Skip to content

Commit 8618d83

Browse files
Shawn LeeAndroid Build Coastguard Worker
authored andcommitted
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 bef2be6) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e640447d16c4e893927e2f76bda8b1073bb18f8) Merged-In: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
1 parent 2a6f371 commit 8618d83

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2843,6 +2843,7 @@ public void setHeadsUpAnimatingAway(boolean headsUpAnimatingAway) {
28432843
/** Set whether the bouncer is showing. */
28442844
public void setBouncerShowing(boolean bouncerShowing) {
28452845
mBouncerShowing = bouncerShowing;
2846+
mNotificationStackScrollLayoutController.updateShowEmptyShadeView();
28462847
updateVisibility();
28472848
}
28482849

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,8 @@ public void updateShowEmptyShadeView() {
12401240
// Hide empty shade view when in transition to Keyguard.
12411241
// That avoids "No Notifications" to blink when transitioning to AOD.
12421242
// For more details, see: b/228790482
1243-
&& !isInTransitionToKeyguard();
1243+
&& !isInTransitionToKeyguard()
1244+
&& !mCentralSurfaces.isBouncerShowing();
12441245

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

0 commit comments

Comments
 (0)