commit 23a2bec5813d562d83a1de236e4ae94b505cde74
author Jon Miranda <jonmiranda@google.com> Thu Jan 30 11:29:07 2020 -0800
committer Jon Miranda <jonmiranda@google.com> Thu Jan 30 11:29:07 2020 -0800
tree df0a37cec615401f70790b69391d9a5f502a85d8
parent ae5e991f5e0be094e11bc9f1af22ccabbe90fd14

Use original disabled icon for app animations with disabled icons.

Bug: 129328259
Change-Id: I7617d6d87e299a0bb0a963b5eec573dd372fd799

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 0c9a28b..fa625ed 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -399,7 +399,8 @@
         Drawable drawable = null;
         Drawable badge = null;
         boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                && !info.isDisabled(); // Use original icon for disabled icons.
         Drawable btvIcon = originalView instanceof BubbleTextView
                 ? ((BubbleTextView) originalView).getIcon() : null;
         if (info instanceof SystemShortcut) {