Merge "Fix an issue where bubbles didn't collapse onTaskMovedToFront" into tm-dev (e2acb6ce) · Commits · e / os / android_frameworks_base

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

+9 −17

Original line number	Diff line number	Diff line
		@@ -383,24 +383,16 @@ public class BubbleController {
		mTaskStackListener.addListener(new TaskStackListenerCallback() {
		@Override
		public void onTaskMovedToFront(int taskId) {
		if (mSysuiProxy == null) {
		return;
		}

		mSysuiProxy.isNotificationShadeExpand((expand) -> {
		mMainExecutor.execute(() -> {
		int expandedId = INVALID_TASK_ID;
		if (mStackView != null && mStackView.getExpandedBubble() != null
		&& isStackExpanded() && !mStackView.isExpansionAnimating()
		&& !expand) {
		&& isStackExpanded() && !mStackView.isExpansionAnimating()) {
		expandedId = mStackView.getExpandedBubble().getTaskId();
		}

		if (expandedId != INVALID_TASK_ID && expandedId != taskId) {
		mBubbleData.setExpanded(false);
		}
		});
		});
		}

		@Override