commit 95d84f5e066a758d0716b27cd178e7d96b6046ec
author Liran Binyamin <liranb@google.com> Wed Jul 26 09:43:32 2023 -0400
committer Liran Binyamin <liranb@google.com> Wed Jul 26 15:38:47 2023 -0400
tree fb463e5865e6a87215910aedbfd0cbeb61eff1fe
parent c56c01c3291829fce3f37c12486e36375833a456

Don't animate in the bubble bar unless there are bubbles

Fixes: 290608658
Test: Manual:
      - Remove all bubbles
      - Lock and unlock device
      - Observe that bubble bar is not displayed

      - Remove all bubbles
      - Restart launcher process
      - Observe that bubble bar is not displayed

Change-Id: I850d307394230968f86abc23ba0b4e94f55e10f0

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
index 012a362..24db380 100644
--- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
@@ -362,10 +362,9 @@
         }
         if (bubbleToSelect != null) {
             setSelectedBubble(bubbleToSelect);
-        }
-
-        if (previouslySelectedBubble == null) {
-            mBubbleStashController.animateToInitialState(update.expanded);
+            if (previouslySelectedBubble == null) {
+                mBubbleStashController.animateToInitialState(update.expanded);
+            }
         }
 
         if (update.expandedChanged) {

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java
index a267211..00c2ca1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java
@@ -201,7 +201,7 @@
     public void onSysuiLockedStateChange(boolean isSysuiLocked) {
         if (isSysuiLocked != mIsSysuiLocked) {
             mIsSysuiLocked = isSysuiLocked;
-            if (!mIsSysuiLocked) {
+            if (!mIsSysuiLocked && mBarViewController.hasBubbles()) {
                 animateToInitialState(false /* expanding */);
             }
         }