commit 01554536a952d66bafedc6c5909423e07eda99c1
author Jon Miranda <jonmiranda@google.com> Wed Mar 17 12:11:24 2021 -0400
committer Jon Miranda <jonmiranda@google.com> Wed Mar 17 12:15:48 2021 -0400
tree fd68ab2a470fb4e09b38e83308885bfb7563366b
parent a79c7e422739c890db75d47a4e8de23ef238c04a

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

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index bcb3a54..471f671 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -741,6 +741,10 @@
         if (mIsAnimatingClosed) {
             return;
         }
+
+        mContent.completePendingPageChanges();
+        mContent.snapToPageImmediately(mContent.getDestinationPage());
+
         if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
             mCurrentAnimator.cancel();
         }