From 95d84f5e066a758d0716b27cd178e7d96b6046ec Mon Sep 17 00:00:00 2001 From: Liran Binyamin Date: Wed, 26 Jul 2023 09:43:32 -0400 Subject: [PATCH] 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 --- .../launcher3/taskbar/bubbles/BubbleBarController.java | 7 +++---- .../launcher3/taskbar/bubbles/BubbleStashController.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java index 012a3620fe..24db380553 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 @@ 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) { diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java index a267211efb..00c2ca1b2b 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 class BubbleStashController { public void onSysuiLockedStateChange(boolean isSysuiLocked) { if (isSysuiLocked != mIsSysuiLocked) { mIsSysuiLocked = isSysuiLocked; - if (!mIsSysuiLocked) { + if (!mIsSysuiLocked && mBarViewController.hasBubbles()) { animateToInitialState(false /* expanding */); } }