summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/IconCache.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-05-22 23:39:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-22 23:39:54 -0700
commitb77f116a2b0489178cc4803952027ce9eb5289ad (patch)
tree1d8bc9ae850f15b3239f236820492fa6c126f0a2 /src/com/android/launcher2/IconCache.java
parenta4fe21285b33301ffed4d91ff03886ec5d30481a (diff)
parentdac8591072959f69eaa8c6319311fd111ae75db6 (diff)
downloadandroid_packages_apps_Trebuchet-b77f116a2b0489178cc4803952027ce9eb5289ad.tar.gz
android_packages_apps_Trebuchet-b77f116a2b0489178cc4803952027ce9eb5289ad.tar.bz2
android_packages_apps_Trebuchet-b77f116a2b0489178cc4803952027ce9eb5289ad.zip
Merge "Updating how widget previews look" into jb-dev
Diffstat (limited to 'src/com/android/launcher2/IconCache.java')
-rw-r--r--src/com/android/launcher2/IconCache.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 1e42f1bd2..aa19545bd 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher2/IconCache.java
@@ -20,6 +20,7 @@ import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
@@ -94,15 +95,20 @@ public class IconCache {
}
public Drawable getFullResIcon(ResolveInfo info) {
+ return getFullResIcon(info.activityInfo);
+ }
+
+ public Drawable getFullResIcon(ActivityInfo info) {
+
Resources resources;
try {
resources = mPackageManager.getResourcesForApplication(
- info.activityInfo.applicationInfo);
+ info.applicationInfo);
} catch (PackageManager.NameNotFoundException e) {
resources = null;
}
if (resources != null) {
- int iconId = info.activityInfo.getIconResource();
+ int iconId = info.getIconResource();
if (iconId != 0) {
return getFullResIcon(resources, iconId);
}