commit 4e021bcc56a6d05c5d63d1587cada4c2ade5ca17
author Jonathan Miranda <jonmiranda@google.com> Thu Jul 01 18:48:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 01 18:48:34 2021 +0000
tree c48e364432f468b89363136087eb38679b72dffb
parent cac11af5a18f02f46626cbf8f5aab738113e8e04
parent aa560506ba98b10071b10e2282889d3cbbf5efda

Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: aa560506ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771

Change-Id: I89d96ed914f33f0803cf943d2b74a9482d4e6dcb

src/com/android/launcher3/folder/PreviewItemManager.java

diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index a6674fc..8bef6ad 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -269,6 +269,9 @@
             setDrawable(p, items.get(i));
 
             if (!animate) {
+                if (p.anim != null) {
+                    p.anim.cancel();
+                }
                 computePreviewItemDrawingParams(i, numItemsInFirstPagePreview, p);
                 if (mReferenceDrawable == null) {
                     mReferenceDrawable = p.drawable;