diff options
author | Michael Jurka <mikejurka@google.com> | 2012-03-09 16:04:37 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-09 16:04:37 -0800 |
commit | d9a57a9e4a0b1b9bbadb46c15850ef05e585772a (patch) | |
tree | 4ee91c8cc5aaaf92e8cb9375e1fe951b3a17289c /src/com/android/launcher2 | |
parent | 1505f2a6a0a7ebdaff6767e989cbf4312377fee0 (diff) | |
parent | e384affda684a48c61d99ebfe8be40fb7d46d761 (diff) | |
download | android_packages_apps_Trebuchet-d9a57a9e4a0b1b9bbadb46c15850ef05e585772a.tar.gz android_packages_apps_Trebuchet-d9a57a9e4a0b1b9bbadb46c15850ef05e585772a.tar.bz2 android_packages_apps_Trebuchet-d9a57a9e4a0b1b9bbadb46c15850ef05e585772a.zip |
Merge "Fix case where shortcut label wasn't updating"
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/ShortcutInfo.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/com/android/launcher2/ShortcutInfo.java b/src/com/android/launcher2/ShortcutInfo.java index c0f80aeec..ff3028beb 100644 --- a/src/com/android/launcher2/ShortcutInfo.java +++ b/src/com/android/launcher2/ShortcutInfo.java @@ -93,12 +93,16 @@ class ShortcutInfo extends ItemInfo { public Bitmap getIcon(IconCache iconCache) { if (mIcon == null) { - mIcon = iconCache.getIcon(this.intent); - this.usingFallbackIcon = iconCache.isDefaultIcon(mIcon); + updateIcon(iconCache); } return mIcon; } + public void updateIcon(IconCache iconCache) { + mIcon = iconCache.getIcon(intent); + usingFallbackIcon = iconCache.isDefaultIcon(mIcon); + } + /** * Creates the application intent based on a component name and various launch flags. * Sets {@link #itemType} to {@link LauncherSettings.BaseLauncherColumns#ITEM_TYPE_APPLICATION}. diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index b7fdfe8bb..4e9b955ce 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3483,7 +3483,7 @@ public class Workspace extends SmoothPagedView final View view = layout.getChildAt(j); Object tag = view.getTag(); if (tag instanceof ShortcutInfo) { - ShortcutInfo info = (ShortcutInfo)tag; + ShortcutInfo info = (ShortcutInfo) tag; // We need to check for ACTION_MAIN otherwise getComponent() might // return null for some shortcuts (for instance, for shortcuts to // web pages.) @@ -3495,11 +3495,11 @@ public class Workspace extends SmoothPagedView for (int k = 0; k < appCount; k++) { ApplicationInfo app = apps.get(k); if (app.componentName.equals(name)) { - info.setIcon(mIconCache.getIcon(info.intent)); - ((TextView)view).setCompoundDrawablesWithIntrinsicBounds(null, - new FastBitmapDrawable(info.getIcon(mIconCache)), - null, null); - } + BubbleTextView shortcut = (BubbleTextView) view; + info.updateIcon(mIconCache); + info.title = app.title.toString(); + shortcut.applyFromShortcutInfo(info, mIconCache); + } } } } |