From 3e8cc610b3f55b9bc16e22f5301bbc25cc9b78f3 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Wed, 2 Oct 2024 13:54:41 -0700 Subject: [PATCH] Fix an issue where bubble bar would collapse when rotating When the device is rotated, everything gets recreated, in this case, bubble bar state is typically set to be stashed. However, if taskbar and bubble bar were unstashed while rotating, bubble bar would be incorrectly stashed. To fix this, only do the stash if taskbar is also stashed in this case. Flag: com.android.wm.shell.enable_bubble_bar Test: manual - be in an app, unstash bubbles, rotate device => observe that bubble bar is unstashed like taskbar after rotation Bug: 353884121 Change-Id: Ia37397c62a1a6819c1bd42261f8a9955db511da3 --- .../launcher3/taskbar/bubbles/BubbleBarViewController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index 025c03860c..ba180a691e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -675,7 +675,8 @@ public class BubbleBarViewController { // if the animation is suppressed, immediately stash or show the bubble bar to // ensure they've been initialized. if (mTaskbarStashController.isInApp() - && mBubbleStashController.isTransientTaskBar()) { + && mBubbleStashController.isTransientTaskBar() + && mTaskbarStashController.isStashed()) { mBubbleStashController.stashBubbleBarImmediate(); } else { mBubbleStashController.showBubbleBarImmediate();