Merge "Revert "Fix stack visibility after unlocking"" into main (12cedc02) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -2643,12 +2643,22 @@ public class BubbleController implements ConfigurationChangeListener,
		mIsStatusBarShade, hasBubbles());
		if (!mIsStatusBarShade) {
		// Bubbles don't appear when the device is locked.
		mBubblesRootView.setVisibility(INVISIBLE);
		if (mStackView != null) {
		mStackView.setVisibility(INVISIBLE);
		}
		if (mLayerView != null) {
		mLayerView.setVisibility(INVISIBLE);
		}
		} else if (hasBubbles()) {
		// If we're unlocked, show the stack if we have bubbles. If we don't have bubbles, the
		// stack will be set to INVISIBLE in onAllBubblesAnimatedOut after the bubbles animate
		// out.
		mBubblesRootView.setVisibility(VISIBLE);
		if (mStackView != null) {
		mStackView.setVisibility(VISIBLE);
		}
		if (mLayerView != null) {
		mLayerView.setVisibility(VISIBLE);
		}
		}

		if (mStackView != null) {