diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-09 10:43:58 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-13 10:31:12 -0800 |
| commit | 1cd01b023acc123b771765b7297d8aaedac224e0 (patch) | |
| tree | 9f275f4cbf290c7fb7e67a913bba14079abcd982 /src/com/android/launcher3/shortcuts | |
| parent | 824c540f1911101321ebe7f05cb0885a4922e363 (diff) | |
| download | android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.tar.gz android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.tar.bz2 android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.zip | |
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
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutView.java | 5 |
1 files changed, 1 insertions, 4 deletions
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. |