From f03524ae7445cfbdff6a8cfdf778c9ee8882b6d5 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 11 Mar 2024 17:54:17 +0000
Subject: [PATCH] Re-calculate mLastComputedCarouselTaskSize when its empty
 before getMaxScaleForFullScreen

- Follow-up on ag/26499257 to do the same on mLastComputedCarouselTaskSize
- Also changing the mLastComputedTaskSize check to isEmpty

Bug: 326550571
Flag: none
Test: Swipe up, quick switch with Pixel / 3P launcher
Change-Id: If934bf4baf2782cd752b5621ad5e9be4a2013c49
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2cbeb31fbd..eead41340d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -5162,9 +5162,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public float getMaxScaleForFullScreen() {
         if (enableGridOnlyOverview() && mActivity.getDeviceProfile().isTablet
                 && !mOverviewGridEnabled) {
+            if (mLastComputedCarouselTaskSize.isEmpty()) {
+                mSizeStrategy.calculateCarouselTaskSize(mActivity, mActivity.getDeviceProfile(),
+                        mLastComputedCarouselTaskSize, getPagedOrientationHandler());
+            }
             mTempRect.set(mLastComputedCarouselTaskSize);
         } else {
-            if (mLastComputedTaskSize.height() == 0 || mLastComputedTaskSize.width() == 0) {
+            if (mLastComputedTaskSize.isEmpty()) {
                 getTaskSize(mLastComputedTaskSize);
             }
             mTempRect.set(mLastComputedTaskSize);