From 6f736fac6590b63ebb27210b2262fe635a2aaaba Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 9 Jun 2021 13:07:32 +0100
Subject: [PATCH] Avoid unnecessary onLayout if gesture is going to HOME

Fixes: 186508379
Test: manual swipe up to carousel, then to home
Change-Id: I97a642a6fc4c4d0ca3805b79db60b6dfdaea1315
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index c57d1562b9..2cfaa4db44 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2781,6 +2781,12 @@ 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) {
+            return;
+        }
+
         super.onLayout(changed, left, top, right, bottom);
 
         updateEmptyStateUi(changed);