Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Call stopInflation() on bubbles we're removing." into rvc-dev am: 453174821e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12027060

Change-Id: I31bf6337108233df074049f58847ad435c239f1d
This commit is contained in:
Josh Tsuji
2020-06-29 17:15:03 +00:00
committed by Automerger Merge Worker
parent d0f09fc39f 453174821e
commit 270af3a9ec
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
View File

@@ -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);