Merge "Badging shortcuts with app icons" into ub-launcher3-calgary

2 files changed, 10 insertions, 2 deletions

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index 7b24c2676..8bb0e081f 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -47,6 +47,7 @@ import com.android.launcher3.AppInfo;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
+import com.android.launcher3.IconCache;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
@@ -748,8 +749,9 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
         }
 
         @Override
-        protected Bitmap getBadgedIcon(Drawable unbadgedIcon, Context context) {
-            return Utilities.createScaledBitmapWithoutShadow(unbadgedIcon, context);
+        protected Bitmap getBadgedIcon(Bitmap unbadgedBitmap, ShortcutInfoCompat shortcutInfo,
+                IconCache cache, Context context) {
+            return unbadgedBitmap;
         }
     }
 }
diff --git a/src/com/android/launcher3/shortcuts/ShortcutInfoCompat.java b/src/com/android/launcher3/shortcuts/ShortcutInfoCompat.java
index d7fcda6b7..410693ada 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutInfoCompat.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutInfoCompat.java
@@ -24,6 +24,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.android.launcher3.ItemInfo;
+import com.android.launcher3.compat.DeferredLauncherActivityInfo;
+import com.android.launcher3.compat.LauncherActivityInfoCompat;
 import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.compat.UserManagerCompat;
 
@@ -116,4 +118,8 @@ public class ShortcutInfoCompat {
     public String toString() {
         return mShortcutInfo.toString();
     }
+
+    public LauncherActivityInfoCompat getActivityInfo(Context context) {
+        return new DeferredLauncherActivityInfo(getActivity(), getUserHandle(), context);
+    }
 }