diff options
| author | Winson Chung <winsonc@google.com> | 2011-11-01 10:43:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-01 10:43:54 -0700 |
| commit | 32f491c9dfc21ad92fef28fce45dcee6ba036593 (patch) | |
| tree | 7fa2f1dee6d9abfd727bde0c8d4464197ada4de4 /src/com | |
| parent | 132793e607313aa6f573d2241706fd12db6f1651 (diff) | |
| parent | 0b9fcf5686a24b237a1a52c13ef60ef776561b91 (diff) | |
| download | android_packages_apps_Trebuchet-32f491c9dfc21ad92fef28fce45dcee6ba036593.tar.gz android_packages_apps_Trebuchet-32f491c9dfc21ad92fef28fce45dcee6ba036593.tar.bz2 android_packages_apps_Trebuchet-32f491c9dfc21ad92fef28fce45dcee6ba036593.zip | |
Merge "Fixing issue where default widget previews were not using large icons on tablet." into ics-mr1
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/IconCache.java | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 4d8a9cf71..d90e39d33 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -932,7 +932,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen Bitmap preview = Bitmap.createBitmap(bitmapSize, bitmapSize, Config.ARGB_8888); // Render the icon - Drawable icon = mIconCache.getFullResIcon(info, mPackageManager); + Drawable icon = mIconCache.getFullResIcon(info); renderDrawableToBitmap(icon, preview, offset, offset, mAppIconSize, mAppIconSize); return preview; } @@ -1014,7 +1014,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen Drawable icon = null; int hoffset = (int) (bitmapWidth / 2 - mAppIconSize * iconScale / 2); int yoffset = (int) (bitmapHeight / 2 - mAppIconSize * iconScale / 2); - if (info.icon > 0) icon = mPackageManager.getDrawable(packageName, info.icon, null); + if (info.icon > 0) icon = mIconCache.getFullResIcon(packageName, info.icon); if (icon == null) icon = resources.getDrawable(R.drawable.ic_launcher_application); renderDrawableToBitmap(icon, preview, hoffset, yoffset, diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 7f3ae860c..a0412af35 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -86,10 +86,25 @@ public class IconCache { 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 @@ public class IconCache { } entry.icon = Utilities.createIconBitmap( - getFullResIcon(info, mPackageManager), mContext); + getFullResIcon(info), mContext); } return entry; } |