Merge "Call stopInflation() on bubbles we're removing." into rvc-dev (45317482) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -476,6 +476,9 @@ public class BubbleData {
	if (DEBUG_BUBBLE_DATA) {		if (DEBUG_BUBBLE_DATA) {
	Log.d(TAG, "Cancel overflow bubble: " + b);		Log.d(TAG, "Cancel overflow bubble: " + b);
	}		}
			if (b != null) {
			b.stopInflation();
			}
	mLogger.logOverflowRemove(b, reason);		mLogger.logOverflowRemove(b, reason);
	mStateChange.bubbleRemoved(b, reason);		mStateChange.bubbleRemoved(b, reason);
	mOverflowBubbles.remove(b);		mOverflowBubbles.remove(b);
	@@ -483,6 +486,7 @@ public class BubbleData {
	return;		return;
	}		}
	Bubble bubbleToRemove = mBubbles.get(indexToRemove);		Bubble bubbleToRemove = mBubbles.get(indexToRemove);
			bubbleToRemove.stopInflation();
	if (mBubbles.size() == 1) {		if (mBubbles.size() == 1) {
	// Going to become empty, handle specially.		// Going to become empty, handle specially.
	setExpandedInternal(false);		setExpandedInternal(false);