diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-30 18:30:15 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-09-01 12:15:10 -0700 |
| commit | ddc9c1fb1ab426772add520d277ea9c2cd674094 (patch) | |
| tree | 7041f6129e0b060ed68413a75cbd3c505475f823 /src/com/android/launcher2/ShortcutInfo.java | |
| parent | 0649843cbf836c0883dd638c5e6a291860fa957b (diff) | |
| download | android_packages_apps_Trebuchet-ddc9c1fb1ab426772add520d277ea9c2cd674094.tar.gz android_packages_apps_Trebuchet-ddc9c1fb1ab426772add520d277ea9c2cd674094.tar.bz2 android_packages_apps_Trebuchet-ddc9c1fb1ab426772add520d277ea9c2cd674094.zip | |
DO NOT MERGE - Fix 2941495: Launcher short-cut icons don't work for apps on SD card after reboot
Bug: 2941495
Change-Id: Ie8e0e0c62259f8cf933e53b7aa2dc28a835110ae
Diffstat (limited to 'src/com/android/launcher2/ShortcutInfo.java')
| -rw-r--r-- | src/com/android/launcher2/ShortcutInfo.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/launcher2/ShortcutInfo.java b/src/com/android/launcher2/ShortcutInfo.java index b0da3a5b9..72f2d518c 100644 --- a/src/com/android/launcher2/ShortcutInfo.java +++ b/src/com/android/launcher2/ShortcutInfo.java @@ -52,11 +52,6 @@ class ShortcutInfo extends ItemInfo { boolean usingFallbackIcon; /** - * Indicates whether the shortcut is on external storage and may go away at any time. - */ - boolean onExternalStorage; - - /** * If isShortcut=true and customIcon=false, this contains a reference to the * shortcut icon as an application's resource. */ @@ -99,6 +94,7 @@ class ShortcutInfo extends ItemInfo { public Bitmap getIcon(IconCache iconCache) { if (mIcon == null) { mIcon = iconCache.getIcon(this.intent); + this.usingFallbackIcon = iconCache.isDefaultIcon(mIcon); } return mIcon; } @@ -133,7 +129,7 @@ class ShortcutInfo extends ItemInfo { LauncherSettings.BaseLauncherColumns.ICON_TYPE_BITMAP); writeBitmap(values, mIcon); } else { - if (onExternalStorage && !usingFallbackIcon) { + if (!usingFallbackIcon) { writeBitmap(values, mIcon); } values.put(LauncherSettings.BaseLauncherColumns.ICON_TYPE, |