Fixing issue where default widget previews were not using large icons on tablet.
Change-Id: I66469f52172be8ee526dc71cc5b6aa797f6a3289
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 7f3ae86..a0412af 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher2/IconCache.java
@@ -86,10 +86,25 @@
return (d != null) ? d : getFullResDefaultActivityIcon();
}
- public Drawable getFullResIcon(ResolveInfo info, PackageManager packageManager) {
+ public Drawable getFullResIcon(String packageName, int iconId) {
Resources resources;
try {
- resources = packageManager.getResourcesForApplication(
+ resources = mPackageManager.getResourcesForApplication(packageName);
+ } catch (PackageManager.NameNotFoundException e) {
+ resources = null;
+ }
+ if (resources != null) {
+ if (iconId != 0) {
+ return getFullResIcon(resources, iconId);
+ }
+ }
+ return getFullResDefaultActivityIcon();
+ }
+
+ public Drawable getFullResIcon(ResolveInfo info) {
+ Resources resources;
+ try {
+ resources = mPackageManager.getResourcesForApplication(
info.activityInfo.applicationInfo);
} catch (PackageManager.NameNotFoundException e) {
resources = null;
@@ -198,7 +213,7 @@
}
entry.icon = Utilities.createIconBitmap(
- getFullResIcon(info, mPackageManager), mContext);
+ getFullResIcon(info), mContext);
}
return entry;
}