| commit | 9dd7aa50ab43aefa7d2fcaa3577340e1c2b224c6 | [log] [tgz] |
|---|---|---|
| author | Stefan Andonian <andonian@google.com> | Thu Jun 02 15:53:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 02 15:53:50 2022 +0000 |
| tree | c25b47c274a1236a8009476c7caa3fff6c0167dc | |
| parent | f23d676049e28aa1d7b245ff69e6d22549c6e630 [diff] | |
| parent | 0c809bbe67d719719e7782b8acd401ee9d0427bf [diff] |
Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699 Change-Id: I8b8a214b0e9a2eb64f3ecc1762a3a6b47d05a03c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;