Merge "Snap to destination page before animating folder close." into sc-dev am: 1536248f3d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13899901 Change-Id: Ifd418dfb534b09ff46a83e8a9f97ee7ba2021dc3
2021-03-31 19:51:27 +00:00
parent c77d255e3e 1536248f3d
commit 21297ff5b3
1 changed files with 4 additions and 0 deletions
@@ -745,6 +745,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();
        }