From a39cc8a82c475c4e9a4c0d0ff76ee42b9fe3eecf Mon Sep 17 00:00:00 2001
From: Amir Zaidi <azaidi@live.nl>
Date: Fri, 3 Aug 2018 23:05:24 +0200
Subject: [PATCH] Parse backported shortcut icon if it is a string

---
 .../shortcuts/ShortcutInfoCompatBackport.java        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java b/src/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java
index 5a12669d0f..6c2dbe386d 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java
@@ -76,9 +76,15 @@ public class ShortcutInfoCompatBackport extends ShortcutInfoCompat {
 
         mEnabled = !xmlData.containsKey("enabled") || xmlData.get("enabled").toLowerCase().equals("true");
 
-        mIcon = xmlData.containsKey("icon") ?
-                Integer.valueOf(xmlData.get("icon").substring(1)) :
-                0;
+        if (xmlData.containsKey("icon")) {
+            String icon = xmlData.get("icon");
+            int resId = resources.getIdentifier(icon, null, packageName);
+            mIcon = resId == 0
+                    ? Integer.parseInt(icon.substring(1))
+                    : resId;
+        } else {
+            mIcon = 0;
+        }
 
         mShortLabel = xmlData.containsKey("shortcutShortLabel") ?
                 resources.getString(Integer.valueOf(xmlData.get("shortcutShortLabel").substring(1))) :