openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use original disabled icon for app animations with disabled icons." into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2020-01-31 20:03:24 +00:00 committed by Android (Google) Code Review
parent 75ee409b0a 23a2bec581
commit 766a5d1337
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/views/FloatingIconView.java
View File

@ -399,7 +399,8 @@ public class FloatingIconView extends View implements
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) {