commit d67e47294e52c186a243be6bedaeeab2ccfaba17
author Stefan Andonian <andonian@google.com> Thu Jun 02 16:10:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 02 16:10:04 2022 +0000
tree c4aa4e801d03a276bd8d44622fa7e923097339c2
parent 064f3ef1030db0aeb7c5775dbf161ab1463c46f5
parent 9dd7aa50ab43aefa7d2fcaa3577340e1c2b224c6

Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab

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

Change-Id: If43a7b8fa1722abdc7d1c49a15cca1d7d5189bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/views/FloatingIconView.java

diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index babe607..acdd9a1 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -525,7 +525,7 @@
                     & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
                 btvIcon = btv.makePreloadIcon();
             } else {
-                btvIcon = btv.getIcon();
+                btvIcon = (FastBitmapDrawable) btv.getIcon().getConstantState().newDrawable();
             }
         } else {
             btvIcon = null;