Merge "Don't animate in the bubble bar unless there are bubbles" into udc-qpr-dev am: 5c936d6246

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211443

Change-Id: I087062a372d1aecdbd72de89e42eb070efe6a569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -362,10 +362,9 @@ public class BubbleBarController extends IBubblesListener.Stub {
         }
         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

@@ -201,7 +201,7 @@ public class BubbleStashController {
     public void onSysuiLockedStateChange(boolean isSysuiLocked) {
         if (isSysuiLocked != mIsSysuiLocked) {
             mIsSysuiLocked = isSysuiLocked;
-            if (!mIsSysuiLocked) {
+            if (!mIsSysuiLocked && mBarViewController.hasBubbles()) {
                 animateToInitialState(false /* expanding */);
             }
         }