From bf869d5de1be7b7735beee6b501c8175d004e6f1 Mon Sep 17 00:00:00 2001 From: mpodolian Date: Tue, 22 Apr 2025 15:22:58 -0700 Subject: [PATCH] Check the bubble bar maximum so it is not cut off. Add check of the bubble bar highest size when setting the taskbar window size from TaskbarViewController.onRotationChanged Fixes: 407708503 Test: Manual. Use foldable device, set navigation mode to the 3 buttons. Fold the device and trigger bubble. Lock screen. Unfold. Unlock screen. The bubble remains visible. Flag: EXEMPT bugfix Change-Id: If16bf289ea394f6586d8530182db000dbcdea214 --- .../com/android/launcher3/taskbar/TaskbarViewController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index c7d8a50383..b0cde752d4 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -1218,6 +1218,11 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar } else { taskbarWindowSize = deviceProfile.taskbarHeight + deviceProfile.getTaskbarOffsetY(); } + if (mBubbleControllers != null) { + int bubbleBarMaxHeight = mBubbleControllers.bubbleBarViewController + .getBubbleBarWithFlyoutMaximumHeight(); + taskbarWindowSize = Math.max(taskbarWindowSize, bubbleBarMaxHeight); + } mActivity.setTaskbarWindowSize(taskbarWindowSize); mTaskbarNavButtonTranslationY.updateValue(-deviceProfile.getTaskbarOffsetY()); }