aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use original BubbleTextView icon for legacy stamped forced adaptive icons.

Browse Source 
Bug: 129297366
Change-Id: Ic71c42e603cc361b716ba65067a772d19ef394f7
This commit is contained in:
Jon Miranda
2019-05-01 20:33:54 -07:00
parent 35bda496f3
commit 27530c99e2
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,7 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
public static final float SHAPE_PROGRESS_DURATION = 0.15f;
private static final int FADE_DURATION_MS = 200;
private static final Rect sTmpRect = new Rect();
private static final Object[] sTmpObjArray = new Object[1];
private Runnable mEndRunnable;
private CancellationSignal mLoadIconSignal;
@@ -208,10 +209,7 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
Drawable drawable = null;
boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
if (!supportsAdaptiveIcons && v instanceof BubbleTextView) {
// Similar to DragView, we simply use the BubbleTextView icon here.
drawable = ((BubbleTextView) v).getIcon();
}
Drawable btvIcon = v instanceof BubbleTextView ? ((BubbleTextView) v).getIcon() : null;
if (info instanceof SystemShortcut) {
if (v instanceof ImageView) {
drawable = ((ImageView) v).getDrawable();
@@ -220,10 +218,24 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
} else {
drawable = v.getBackground();
}
}
if (drawable == null) {
drawable = Utilities.getFullDrawable(launcher, info, lp.width, lp.height,
false, new Object[1]);
} else {
if (supportsAdaptiveIcons) {
drawable = Utilities.getFullDrawable(launcher, info, lp.width, lp.height,
false, sTmpObjArray);
if (!(drawable instanceof AdaptiveIconDrawable)) {
// The drawable we get back is not an adaptive icon, so we need to use the
// BubbleTextView icon that is already legacy treated.
drawable = btvIcon;
}
} else {
if (v instanceof BubbleTextView) {
// Similar to DragView, we simply use the BubbleTextView icon here.
drawable = btvIcon;
} else {
drawable = Utilities.getFullDrawable(launcher, info, lp.width, lp.height,
false, sTmpObjArray);
}
}
}
Drawable finalDrawable = drawable == null ? null