From 3a5f6c0acc686e7d851a5682550f28a02c6acd66 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Fri, 29 Jan 2021 20:51:34 -0600
Subject: [PATCH] Skip reorder animation while collapsing

Fixes: 178499353
Test: add new bubble while expanded, then collapse
    => collapse animation runs okay
Change-Id: Ieca5ebc4d799ce081794620928fa90e914c30dfc
---
 .../src/com/android/wm/shell/bubbles/BubbleStackView.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
index fac368677d12d..2ad29e99de92e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
@@ -1475,6 +1475,9 @@ public class BubbleStackView extends FrameLayout
      * Update bubble order and pointer position.
      */
     public void updateBubbleOrder(List<Bubble> bubbles) {
+        if (isExpansionAnimating()) {
+            return;
+        }
         final Runnable reorder = () -> {
             for (int i = 0; i < bubbles.size(); i++) {
                 Bubble bubble = bubbles.get(i);