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

Commit 2e640447 authored Apr 17, 2023 by Shawn Lee

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
Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
(cherry picked from commit bef2be67)

parent b8dfb743

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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();
	}		}

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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());