summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/IconCache.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/IconCache.java')
-rw-r--r--src/com/android/launcher3/IconCache.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index b4bb5b9c3..e1659e795 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -252,8 +252,16 @@ public class IconCache {
entry.title = info.activityInfo.name;
}
- entry.icon = Utilities.createIconBitmap(
- getFullResIcon(info), mContext);
+ Drawable icon = getFullResIcon(info);
+ if (mIconPackHelper.isIconPackLoaded() && (mIconPackHelper
+ .getResourceIdForActivityIcon(info.activityInfo) == 0)) {
+ entry.icon = Utilities.createIconBitmap(
+ icon, mContext, mIconPackHelper.getIconBack(),
+ mIconPackHelper.getIconMask(), mIconPackHelper.getIconUpon(), mIconPackHelper.getIconScale());
+ } else {
+ entry.icon = Utilities.createIconBitmap(
+ icon, mContext);
+ }
}
return entry;
}