diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-25 16:20:38 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-09-26 01:07:11 +0000 |
| commit | c5fb59fb9a36180ce962f565d85aa92f9991da1a (patch) | |
| tree | f4ce966a5f15f9a5fcaab77b4fc9ada015e76490 /src/com/android/launcher3/ShortcutInfo.java | |
| parent | f876301d0a460bec260a3c7a6ab260a06d5817ba (diff) | |
| download | android_packages_apps_Trebuchet-c5fb59fb9a36180ce962f565d85aa92f9991da1a.tar.gz android_packages_apps_Trebuchet-c5fb59fb9a36180ce962f565d85aa92f9991da1a.tar.bz2 android_packages_apps_Trebuchet-c5fb59fb9a36180ce962f565d85aa92f9991da1a.zip | |
Fixing loadWorkspace being called multiple times
Using right intent when refreshing shortcut icons
Bug: 17662782
Bug: 17663766
Bug: 17569197
Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24
Diffstat (limited to 'src/com/android/launcher3/ShortcutInfo.java')
| -rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 5b27f845e..daf343460 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -174,7 +174,7 @@ public class ShortcutInfo extends ItemInfo { } public void updateIcon(IconCache iconCache) { - mIcon = iconCache.getIcon(intent, user); + mIcon = iconCache.getIcon(promisedIntent != null ? promisedIntent : intent, user); usingFallbackIcon = iconCache.isDefaultIcon(mIcon, user); } |