Merge "Fix bubble added from the overflow background arrow animation." into main

2025-01-04 10:24:15 -08:00
parent bdc352f645 7f88d9fc83
commit 8b3f1e1c3f
5 changed files with 82 additions and 39 deletions
@@ -902,9 +902,15 @@ public class BubbleBarViewController {
    /**
     * Adds the provided bubble to the bubble bar.
     */
-    public void addBubble(BubbleBarItem b, boolean isExpanding, boolean suppressAnimation) {
+    public void addBubble(BubbleBarItem b,
+            boolean isExpanding,
+            boolean suppressAnimation,
+            @Nullable BubbleBarBubble bubbleToSelect
+    ) {
        if (b != null) {
-            mBarView.addBubble(b.getView());
+            BubbleView bubbleToSelectView =
+                    bubbleToSelect == null ? null : bubbleToSelect.getView();
+            mBarView.addBubble(b.getView(), bubbleToSelectView);
            b.getView().setOnClickListener(mBubbleClickListener);
            mBubbleDragController.setupBubbleView(b.getView());
            b.getView().setController(mBubbleViewController);