Add back code missing from upstream merge

Change-Id: I7c2f08ed1b9c7462feabe1ad793af4ddc55aff1b
2020-08-10 13:11:43 -07:00
parent c0ed292ccb
commit 90751820d9
1 changed files with 10 additions and 0 deletions
@@ -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) {