Merge "Fix subsequent notifs appearing in the shade." (4e5e4b73) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -528,7 +528,9 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
		/**
		* Removes and releases an ActivityView if one was previously created for this bubble.
		*/
		public void destroyActivityView() {
		public void cleanUpExpandedState() {
		removeView(mNotifRow);

		if (mActivityView == null) {
		return;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -385,7 +385,7 @@ public class BubbleStackView extends FrameLayout {

		// Remove it from the views
		int removedIndex = mBubbleContainer.indexOfChild(b.iconView);
		b.expandedView.destroyActivityView();
		b.expandedView.cleanUpExpandedState();
		mBubbleContainer.removeView(b.iconView);

		int bubbleCount = mBubbleContainer.getChildCount();
		@@ -414,7 +414,7 @@ public class BubbleStackView extends FrameLayout {
		public void stackDismissed() {
		for (Bubble bubble : mBubbleData.getBubbles()) {
		bubble.entry.setBubbleDismissed(true);
		bubble.expandedView.destroyActivityView();
		bubble.expandedView.cleanUpExpandedState();
		}
		mBubbleData.clear();
		collapseStack();
		@@ -495,7 +495,7 @@ public class BubbleStackView extends FrameLayout {
		}

		/**
		* Expands the stack fo bubbles.
		* Expands the stack of bubbles.
		* <p>
		* Must be called from the main thread.
		*/