From 2ef1ab4017aa87cbb2818679d784e3bdb832f631 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 20 Jun 2017 10:42:04 -0700 Subject: Show and update preload icons when they are in a FolderIcon preview. Bug: 62626549 Change-Id: Ie0ad06d0239dccb8d8388381ffe845c4bbc079d6 --- src/com/android/launcher3/folder/FolderIcon.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/com/android/launcher3/folder/FolderIcon.java') diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index aaa19afa5..f3b7fbe6b 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -75,6 +75,7 @@ import com.android.launcher3.badge.FolderBadgeInfo; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragView; +import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.util.Themes; import com.android.launcher3.graphics.IconPalette; import com.android.launcher3.util.Thunk; @@ -511,7 +512,8 @@ public class FolderIcon extends FrameLayout implements FolderListener { if (d != null) { mTempBounds.set(d.getBounds()); d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize); - if (d instanceof FastBitmapDrawable) { + boolean isPreloadIcon = d instanceof PreloadIconDrawable; + if (!isPreloadIcon && d instanceof FastBitmapDrawable) { FastBitmapDrawable fd = (FastBitmapDrawable) d; fd.drawWithBrightness(canvas, params.overlayAlpha); } else { -- cgit v1.2.3