summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedViewIcon.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-05-05 15:41:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-05 15:41:26 -0700
commit563ed71d682cc979a095fff7d27f1afe378508df (patch)
tree8cc2b6746c9a72cedd8e90b4f7f1e112c958afd2 /src/com/android/launcher2/PagedViewIcon.java
parentb9b8ce94ff958792dd6ef81b0e50784fe8ad98a6 (diff)
parent4dbea7920a5f52df1d35009352f7e5cba16c05fb (diff)
downloadandroid_packages_apps_Trebuchet-563ed71d682cc979a095fff7d27f1afe378508df.tar.gz
android_packages_apps_Trebuchet-563ed71d682cc979a095fff7d27f1afe378508df.tar.bz2
android_packages_apps_Trebuchet-563ed71d682cc979a095fff7d27f1afe378508df.zip
Merge "Cleaning up icon code."
Diffstat (limited to 'src/com/android/launcher2/PagedViewIcon.java')
-rw-r--r--src/com/android/launcher2/PagedViewIcon.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java
index d9852adcf..7aeb0af15 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher2/PagedViewIcon.java
@@ -19,6 +19,7 @@ package com.android.launcher2;
import com.android.launcher.R;
import android.animation.ObjectAnimator;
+import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -171,8 +172,8 @@ public class PagedViewIcon extends CachedTextView implements Checkable {
public void applyFromResolveInfo(ResolveInfo info, PackageManager packageManager,
PagedViewIconCache cache, IconCache modelIconCache, boolean createHolographicOutlines) {
- mIcon = Utilities.createIconBitmap(
- modelIconCache.getFullResIcon(info, packageManager), mContext);
+ ComponentName cn = new ComponentName(info.activityInfo.packageName, info.activityInfo.name);
+ mIcon = modelIconCache.getIcon(cn, info);
setCompoundDrawablesWithIntrinsicBounds(null, new FastBitmapDrawable(mIcon), null, null);
setText(info.loadLabel(packageManager));
setTag(info);