From 90751820d9ef8f09ece7aba656dfe881e3b149dd Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 10 Aug 2020 13:11:43 -0700
Subject: [PATCH] Add back code missing from upstream merge

Change-Id: I7c2f08ed1b9c7462feabe1ad793af4ddc55aff1b
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index b6d44eb300..c10527bcfe 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -525,6 +525,16 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             recentsAttachedToAppWindow = mIsShelfPeeking || mIsLikelyToStartNewTask;
         }
         mAnimationFactory.setRecentsAttachedToAppWindow(recentsAttachedToAppWindow, animate);
+
+        // Reapply window transform throughout the attach animation, as the animation affects how
+        // much the window is bound by overscroll (vs moving freely).
+        if (animate) {
+            ValueAnimator reapplyWindowTransformAnim = ValueAnimator.ofFloat(0, 1);
+            reapplyWindowTransformAnim.addUpdateListener(anim -> applyWindowTransform());
+            reapplyWindowTransformAnim.setDuration(RECENTS_ATTACH_DURATION).start();
+        } else {
+            applyWindowTransform();
+        }
     }
 
     public void setIsLikelyToStartNewTask(boolean isLikelyToStartNewTask) {