diff options
author | Kenny Root <kroot@google.com> | 2011-03-10 13:10:08 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-10 13:10:08 -0800 |
commit | 6c1dde4d59abc651598d9c8380c18037e8e8f715 (patch) | |
tree | 2e68fbe7370ff287aa1a44300d18be46f98041f0 | |
parent | 132ab8dc2263d264998a978e7aa067b646b2a46f (diff) | |
parent | 20b0a5f0fd283cda62ed4f94b72f8ff0833baf75 (diff) | |
download | android_packages_apps_Trebuchet-6c1dde4d59abc651598d9c8380c18037e8e8f715.tar.gz android_packages_apps_Trebuchet-6c1dde4d59abc651598d9c8380c18037e8e8f715.tar.bz2 android_packages_apps_Trebuchet-6c1dde4d59abc651598d9c8380c18037e8e8f715.zip |
Merge "Applications with broken resources get default icon" into honeycomb-mr1
-rw-r--r-- | src/com/android/launcher2/IconCache.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 2e47adc9e..0c26bf05c 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -68,11 +68,13 @@ public class IconCache { com.android.internal.R.mipmap.sym_def_app_icon); } - public Drawable getFullResIcon(Resources resources, int iconId) { + public Drawable getFullResIcon(Resources resources, int iconId) + throws Resources.NotFoundException { return resources.getDrawableForDensity(iconId, mIconDpi); } - public Drawable getFullResIcon(ResolveInfo info, PackageManager packageManager) { + public Drawable getFullResIcon(ResolveInfo info, PackageManager packageManager) + throws Resources.NotFoundException { Resources resources; try { resources = packageManager.getResourcesForApplication( @@ -174,8 +176,14 @@ public class IconCache { if (entry.title == null) { entry.title = info.activityInfo.name; } - entry.icon = Utilities.createIconBitmap( - getFullResIcon(info, mPackageManager), mContext); + + Drawable icon; + try { + icon = getFullResIcon(info, mPackageManager); + } catch (Resources.NotFoundException e) { + icon = getFullResDefaultActivityIcon(); + } + entry.icon = Utilities.createIconBitmap(icon, mContext); } return entry; } |