Merge "Force top UI if we're expanded, per Jorim's suggestion." into rvc-dev (b20343ff) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -207,6 +207,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
	/** Whether or not the BubbleStackView has been added to the WindowManager. */		/** Whether or not the BubbleStackView has been added to the WindowManager. */
	private boolean mAddedToWindowManager = false;		private boolean mAddedToWindowManager = false;

			/**
			* Value from {@link NotificationShadeWindowController#getForceHasTopUi()} when we forced top UI
			* due to expansion. We'll restore this value when the stack collapses.
			*/
			private boolean mHadTopUi = false;

	// Listens to user switch so bubbles can be saved and restored.		// Listens to user switch so bubbles can be saved and restored.
	private final NotificationLockscreenUserManager mNotifUserManager;		private final NotificationLockscreenUserManager mNotifUserManager;

	@@ -1291,6 +1297,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
	// Collapsing? Do this first before remaining steps.		// Collapsing? Do this first before remaining steps.
	if (update.expandedChanged && !update.expanded) {		if (update.expandedChanged && !update.expanded) {
	mStackView.setExpanded(false);		mStackView.setExpanded(false);
			mNotificationShadeWindowController.setForceHasTopUi(mHadTopUi);
	}		}

	// Do removals, if any.		// Do removals, if any.
	@@ -1377,6 +1384,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
	if (update.expandedChanged && update.expanded) {		if (update.expandedChanged && update.expanded) {
	if (mStackView != null) {		if (mStackView != null) {
	mStackView.setExpanded(true);		mStackView.setExpanded(true);
			mHadTopUi = mNotificationShadeWindowController.getForceHasTopUi();
			mNotificationShadeWindowController.setForceHasTopUi(true);
	}		}
	}		}