From cda96a5b43b7facfd64ef58f54763862731c9bc4 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 18 Oct 2018 15:05:45 -0700 Subject: Setup make icon-loader library Bug: 115891474 Test: make -j10 icon-loader Next step: Launcher will depend on icon-loader in next CL Change-Id: I797ddb857cf8be79f3be6ca2f174c593ca3713a5 --- src/com/android/launcher3/InstallShortcutReceiver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/InstallShortcutReceiver.java') diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index 7190f1277..851454b77 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -480,7 +480,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { final LauncherAppState app = LauncherAppState.getInstance(mContext); // Set default values until proper values is loaded. appInfo.title = ""; - app.getIconCache().getDefaultIcon(user).applyTo(appInfo); + appInfo.applyFrom(app.getIconCache().getDefaultIcon(user)); final ShortcutInfo si = appInfo.makeShortcut(); if (Looper.myLooper() == LauncherModel.getWorkerLooper()) { app.getIconCache().getTitleAndIcon(si, activityInfo, false /* useLowResIcon */); @@ -495,7 +495,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { } else if (shortcutInfo != null) { ShortcutInfo si = new ShortcutInfo(shortcutInfo, mContext); LauncherIcons li = LauncherIcons.obtain(mContext); - li.createShortcutIcon(shortcutInfo).applyTo(si); + si.applyFrom(li.createShortcutIcon(shortcutInfo)); li.recycle(); return Pair.create((ItemInfo) si, (Object) shortcutInfo); } else if (providerInfo != null) { @@ -656,7 +656,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { if (iconInfo == null) { iconInfo = app.getIconCache().getDefaultIcon(info.user); } - iconInfo.applyTo(info); + info.applyFrom(iconInfo); info.title = Utilities.trim(name); info.contentDescription = UserManagerCompat.getInstance(app.getContext()) -- cgit v1.2.3