Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shawn Lee
2023-06-16 00:01:51 +00:00
committed by Android (Google) Code Review
parent ab7941d8a2 2e640447d1
commit 80b0850938
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -2843,6 +2843,7 @@ public final class NotificationPanelViewController implements Dumpable {
/** Set whether the bouncer is showing. */ /** Set whether the bouncer is showing. */
public void setBouncerShowing(boolean bouncerShowing) { public void setBouncerShowing(boolean bouncerShowing) {
mBouncerShowing = bouncerShowing; mBouncerShowing = bouncerShowing;
mNotificationStackScrollLayoutController.updateShowEmptyShadeView();
updateVisibility(); updateVisibility();
} }

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

@@ -1240,7 +1240,8 @@ public class NotificationStackScrollLayoutController {
// Hide empty shade view when in transition to Keyguard. // Hide empty shade view when in transition to Keyguard.
// That avoids "No Notifications" to blink when transitioning to AOD. // That avoids "No Notifications" to blink when transitioning to AOD.
// For more details, see: b/228790482 // For more details, see: b/228790482
&& !isInTransitionToKeyguard(); && !isInTransitionToKeyguard()
&& !mCentralSurfaces.isBouncerShowing();
mView.updateEmptyShadeView(shouldShow, mZenModeController.areNotificationsHiddenInShade()); mView.updateEmptyShadeView(shouldShow, mZenModeController.areNotificationsHiddenInShade());