From 1cd01b023acc123b771765b7297d8aaedac224e0 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 9 Nov 2016 10:43:58 -0800 Subject: Ensuring that ShortcutInfo always has an icon > Making iconBitmap public instead of a getter (similar to AppInfo) > Removing getIcon() which can lead to IO on UI thread > Removing updateIcon and handling the update at the caller Bug: 21325319 Change-Id: I6a49b9043f974e9629ea25e77012d97cc04c0594 --- src/com/android/launcher3/shortcuts/DeepShortcutView.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/com/android/launcher3/shortcuts') diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutView.java b/src/com/android/launcher3/shortcuts/DeepShortcutView.java index e7fc41512..679613789 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutView.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutView.java @@ -26,9 +26,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.android.launcher3.IconCache; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.LogAccelerateInterpolator; import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; @@ -95,8 +93,7 @@ public class DeepShortcutView extends FrameLayout implements ValueAnimator.Anima /** package private **/ void applyShortcutInfo(UnbadgedShortcutInfo info, DeepShortcutsContainer container) { mInfo = info; - IconCache cache = LauncherAppState.getInstance().getIconCache(); - mBubbleText.applyFromShortcutInfo(info, cache); + mBubbleText.applyFromShortcutInfo(info); mIconView.setBackground(mBubbleText.getIcon()); // Use the long label as long as it exists and fits. -- cgit v1.2.3