From ac7db52a91365d854ebdfae4cd2e65efac312cb9 Mon Sep 17 00:00:00 2001
From: Mykola Podolian <mpodolian@google.com>
Date: Fri, 18 Apr 2025 17:27:46 -0700
Subject: [PATCH] Revert^3 "Maximised the taskbar window to the default size"

This reverts commit de74f01f01bfe8192032b5c98eb5e387f62a2f8a.

Reason for revert: regression

Change-Id: Ia21a7bfb5cb98e0219e32d884d773276ba804e6b
---
 .../taskbar/TaskbarActivityContext.java       | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 3039bfe0fa..1dadfefa98 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -1296,25 +1296,20 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
     }
 
     /**
-     * Updates the TaskbarContainer size, using the maximum of the provided {@code size}
-     * and the default size from {@link #getDefaultTaskbarWindowSize()}.
+     * Updates the TaskbarContainer size (pass {@link #getDefaultTaskbarWindowSize()} to reset).
      */
     public void setTaskbarWindowSize(int size) {
         // In landscape phone button nav mode, we should set the task bar width instead of height
         // because this is the only case in which the nav bar is not on the display bottom.
-        int windowSize = size;
-        if (windowSize != MATCH_PARENT) {
-            windowSize = Math.max(size, getDefaultTaskbarWindowSize());
-        }
         boolean landscapePhoneButtonNav = isPhoneButtonNavMode() && mDeviceProfile.isLandscape;
         if ((landscapePhoneButtonNav ? mWindowLayoutParams.width : mWindowLayoutParams.height)
-                == windowSize || mIsDestroyed) {
+                == size || mIsDestroyed) {
             return;
         }
-        if (windowSize == MATCH_PARENT) {
-            windowSize = mDeviceProfile.heightPx;
+        if (size == MATCH_PARENT) {
+            size = mDeviceProfile.heightPx;
         } else {
-            mLastRequestedNonFullscreenSize = windowSize;
+            mLastRequestedNonFullscreenSize = size;
             if (mIsFullscreen || mIsTaskbarSizeFrozenForAnimatingBubble) {
                 // We either still need to be fullscreen or a bubble is still animating, so defer
                 // any change to our height until setTaskbarWindowFullscreen(false) is called or
@@ -1326,14 +1321,14 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
             }
         }
         if (landscapePhoneButtonNav) {
-            mWindowLayoutParams.width = windowSize;
+            mWindowLayoutParams.width = size;
             for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
-                mWindowLayoutParams.paramsForRotation[rot].width = windowSize;
+                mWindowLayoutParams.paramsForRotation[rot].width = size;
             }
         } else {
-            mWindowLayoutParams.height = windowSize;
+            mWindowLayoutParams.height = size;
             for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
-                mWindowLayoutParams.paramsForRotation[rot].height = windowSize;
+                mWindowLayoutParams.paramsForRotation[rot].height = size;
             }
         }
         mControllers.runAfterInit(