commit e29e31922f9ac930ff25e808b3b49e7ec99f05e0
author Liran Binyamin <liranb@google.com> Wed Jul 10 16:10:41 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 10 16:10:41 2024 +0000
tree d5fbe63d356d3c2608484d1156d3c54cd3e2d1cd
parent 4cebffa209d1bc2642c69f8f6ebf0810426d8073
parent a7821390e221e5d5a75be009c06ae850d02ba1ff

Merge "Fix squished hotseat due to bubbles" into main

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 3fbdc89..0f17a85 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -795,6 +795,11 @@
      */
     public void setUIController(@NonNull TaskbarUIController uiController) {
         mControllers.setUiController(uiController);
+        if (mControllers.bubbleControllers.isEmpty()) {
+            // if the bubble bar was visible in a previous configuration of taskbar and is being
+            // recreated now without bubbles, clean up any bubble bar adjustments from hotseat
+            bubbleBarVisibilityChanged(/* isVisible= */ false);
+        }
     }
 
     /**