commit a47a2017e4c430c581c9d7c682bac85c87f940fc
author Jonathan Miranda <jonmiranda@google.com> Thu Jul 01 18:35:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 01 18:35:25 2021 +0000
tree 255226cfae2909a3334d0d0d5cda9d61866b9974
parent 08fa7008b0a57402d6cab80d3602585f3987dc5e
parent 81501a563cbf846221af75480cd641be9085ffcd

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

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

Change-Id: I2f4175a5b0b232184d2b8cd2200b3e2926903555

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;