commit cda96a5b43b7facfd64ef58f54763862731c9bc4
author Hyunyoung Song <hyunyoungs@google.com> Thu Oct 18 15:05:45 2018 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Fri Oct 19 14:33:46 2018 -0700
tree 76d0d64e7eac0202689feec3c4985b0722d6f044
parent 6083c63e81e2ea5e55feb9e46c887d886dbc183f

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/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index cbfde25..8e9021f 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -657,7 +657,7 @@
         updateAndBindShortcutInfo(() -> {
             si.updateFromDeepShortcutInfo(info, mApp.getContext());
             LauncherIcons li = LauncherIcons.obtain(mApp.getContext());
-            li.createShortcutIcon(info).applyTo(si);
+            si.applyFrom(li.createShortcutIcon(info));
             li.recycle();
             return si;
         });