From 96ffcbcd2d39eb69e8e8db4cd8bed83c4448042b Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 24 Aug 2021 12:36:27 +0100
Subject: [PATCH] Avoid unnecessary onLayout if gesture is going to state
 without overview panel

Fixes: 186508379
Test: swipe up to carousel, then to home
Test: quick switch, immediately swipe up to overview, then to home
Change-Id: I0b28e163cbb289a636a89bc52c43a1977a59d86f
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index abeadfd29b..dc7347e9b0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3314,9 +3314,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        // If we're going to HOME, avoid unnecessary onLayout that cause TaskViews to re-arrange
-        // during animation to HOME.
-        if (mCurrentGestureEndTarget == GestureState.GestureEndTarget.HOME) {
+        // If we're going to a state without overview panel, avoid unnecessary onLayout that
+        // cause TaskViews to re-arrange during animation to that state.
+        if (!mOverviewStateEnabled && !mFirstLayout) {
             return;
         }