From 1da138903bc8412615edacd7a447c6ffc25851d4 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 22 Jun 2017 11:03:40 -0700 Subject: Adding support in IconProvider for loading different icons for UI and model use Bug: 62900800 Change-Id: I86e2d77efc7e5fc85b59cf18e634546d098d138f --- src/com/android/launcher3/IconCache.java | 6 +++++- src/com/android/launcher3/IconProvider.java | 7 +++++-- src/com/android/launcher3/dragndrop/DragView.java | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/com/android/launcher3') diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 09ca5c5cd..ec30de834 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -170,7 +170,11 @@ public class IconCache { } public Drawable getFullResIcon(LauncherActivityInfo info) { - return mIconProvider.getIcon(info, mIconDpi); + return getFullResIcon(info, true); + } + + public Drawable getFullResIcon(LauncherActivityInfo info, boolean flattenDrawable) { + return mIconProvider.getIcon(info, mIconDpi, flattenDrawable); } protected Bitmap makeDefaultIcon(UserHandle user) { diff --git a/src/com/android/launcher3/IconProvider.java b/src/com/android/launcher3/IconProvider.java index a5d399013..687251514 100644 --- a/src/com/android/launcher3/IconProvider.java +++ b/src/com/android/launcher3/IconProvider.java @@ -24,8 +24,11 @@ public class IconProvider { return mSystemState; } - - public Drawable getIcon(LauncherActivityInfo info, int iconDpi) { + /** + * @param flattenDrawable true if the caller does not care about the specification of the + * original icon as long as the flattened version looks the same. + */ + public Drawable getIcon(LauncherActivityInfo info, int iconDpi, boolean flattenDrawable) { return info.getIcon(iconDpi); } } diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index ab2f10036..022b3b8b1 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -272,7 +272,7 @@ public class DragView extends FrameLayout { .resolveActivity(info.getIntent(), info.user); outObj[0] = activityInfo; return (activityInfo != null) ? appState.getIconCache() - .getFullResIcon(activityInfo) : null; + .getFullResIcon(activityInfo, false) : null; } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) { if (info instanceof PendingAddShortcutInfo) { ShortcutConfigActivityInfo activityInfo = -- cgit v1.2.3