commit 2cc33ed29adb97b2660a12b8fa31db3162a6e731
author Jon Miranda <jonmiranda@google.com> Wed Jun 30 17:59:17 2021 -0700
committer Jon Miranda <jonmiranda@google.com> Wed Jun 30 17:59:17 2021 -0700
tree dd2a52c90d820fb79dd866064885dbdd93153851
parent bf60673bbbc08002688b14e1b856eec925895afd

Cancel existing preview item animation during non-animated update.

Otherwise we end up in a bad folder icon state.

Bug: 191227370
Test: Drag icon out of folder bounds,
      Suddenly drop it so its forced to go back to the folder
      Close folder before the animation finishes

Change-Id: Ib751a8209d66c5e9772731fdc1d7f365ae47531a

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;