From adeaf908ecf4f4e6dc68252b4f6426a1215615fa Mon Sep 17 00:00:00 2001
From: mpodolian <mpodolian@google.com>
Date: Tue, 21 Jan 2025 13:19:46 -0800
Subject: [PATCH] Fixed Bubble Bar Cutoff After Unlock

The Bubble Bar was being cut off due to the taskbar window height.
Modified the BubbleBarViewController to rely on the bubble count to
compute the maximum height, rather than the BubbleBarView visibility.

Test: Manually tested. Expanded the Bubble Bar in 3-button navigation.
Pressed the power button to lock the screen. Unlocked the screen.
Fixes: 391358222
Flag: com.android.wm.shell.enable_bubble_bar

Change-Id: I1923fc84df403abea022ba84f23fc66be7dbe7aa
---
 .../launcher3/taskbar/bubbles/BubbleBarViewController.java      | 2 +-
 1 file changed, 1 insertion(+), 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 afbc932af2..026f239152 100644
--- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
@@ -588,7 +588,7 @@ public class BubbleBarViewController {
 
     /** Returns maximum height of the bubble bar with the flyout view. */
     public int getBubbleBarWithFlyoutMaximumHeight() {
-        if (!isBubbleBarVisible() && !isAnimatingNewBubble()) return 0;
+        if (!hasBubbles() && !isAnimatingNewBubble()) return 0;
         int bubbleBarTopOnHome = (int) (mBubbleStashController.getBubbleBarVerticalCenterForHome()
                 + mBarView.getBubbleBarCollapsedHeight() / 2 + mBarView.getArrowHeight());
         if (isAnimatingNewBubble()) {