From 01554536a952d66bafedc6c5909423e07eda99c1 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 17 Mar 2021 12:11:24 -0400
Subject: [PATCH] Snap to destination page before animating folder close.

This ensures the X page animation runs in the preview.

Bug: 175329686
Test: Scroll to 2nd page, and close folder before scroll finishes
Change-Id: Id4820a212dcc945b0134b79f3d42c68954b17275
---
 src/com/android/launcher3/folder/Folder.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index bcb3a54ef3..471f6715c6 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -741,6 +741,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (mIsAnimatingClosed) {
             return;
         }
+
+        mContent.completePendingPageChanges();
+        mContent.snapToPageImmediately(mContent.getDestinationPage());
+
         if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
             mCurrentAnimator.cancel();
         }