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

Commit f24c849c authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix an issue where animated the bubble bar twice from bubble button" into main

parents 897fe257 13431b15

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

+1 −1
Original line number Diff line number Diff line
@@ -2007,7 +2007,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        @Override

        public void selectionChanged(BubbleViewProvider selectedBubble) {

            // Only need to update the layer view if we're currently expanded for selection changes.

            if (mLayerView != null && isStackExpanded()) {

            if (mLayerView != null && mLayerView.isExpanded()) {

                mLayerView.showExpandedView(selectedBubble);

            }

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ public class BubbleBarLayerView extends FrameLayout 
        if (expandedView == null) {

            return;

        }

        if (mExpandedBubble != null && mIsExpanded && b.getKey().equals(mExpandedBubble.getKey())) {

            // Already showing this bubble, skip animating

            return;

        }

        if (mExpandedBubble != null && !b.getKey().equals(mExpandedBubble.getKey())) {

            removeView(mExpandedView);

            mExpandedView = null;