diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-06-20 10:42:04 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-06-20 11:05:34 -0700 |
| commit | 2ef1ab4017aa87cbb2818679d784e3bdb832f631 (patch) | |
| tree | 955985bf8114379e6f74cd5d397191b7d2b65b39 /src/com/android/launcher3/folder/FolderIcon.java | |
| parent | 7e2e2aa80baa4458e086f59e8c55ee016174593c (diff) | |
| download | android_packages_apps_Trebuchet-2ef1ab4017aa87cbb2818679d784e3bdb832f631.tar.gz android_packages_apps_Trebuchet-2ef1ab4017aa87cbb2818679d784e3bdb832f631.tar.bz2 android_packages_apps_Trebuchet-2ef1ab4017aa87cbb2818679d784e3bdb832f631.zip | |
Show and update preload icons when they are in a FolderIcon preview.
Bug: 62626549
Change-Id: Ie0ad06d0239dccb8d8388381ffe845c4bbc079d6
Diffstat (limited to 'src/com/android/launcher3/folder/FolderIcon.java')
| -rw-r--r-- | src/com/android/launcher3/folder/FolderIcon.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 { |