Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 270af3a9 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I31bf6337108233df074049f58847ad435c239f1d
parents d0f09fc3 45317482

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