commit 1536248f3dde6d58ea666aa7cdebf8cd7764e830
author Jonathan Miranda <jonmiranda@google.com> Wed Mar 31 19:14:56 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 31 19:14:56 2021 +0000
tree 2f9caaad2689376123127f0d6b39dc1ba38d8726
parent 21dfadab76be0974ff2b1354e420757b46d561c9
parent 01554536a952d66bafedc6c5909423e07eda99c1

Merge "Snap to destination page before animating folder close." into sc-dev

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 ec7155c..a1b7997 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -745,6 +745,10 @@
         if (mIsAnimatingClosed) {
             return;
         }
+
+        mContent.completePendingPageChanges();
+        mContent.snapToPageImmediately(mContent.getDestinationPage());
+
         if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
             mCurrentAnimator.cancel();
         }