diff options
author | Joe Onorato <joeo@android.com> | 2010-03-07 14:32:10 -0500 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-03-10 15:11:45 -0800 |
commit | 56d8291af6a28c6ba64113120efdf84a785e816c (patch) | |
tree | ea46f3b9c8755086e0044bc910024bbbe0a80c91 /src/com/android/launcher2/ShortcutInfo.java | |
parent | 64e6be78dc72e1a89fe8fb95c502586f9260df28 (diff) | |
download | android_packages_apps_Trebuchet-56d8291af6a28c6ba64113120efdf84a785e816c.tar.gz android_packages_apps_Trebuchet-56d8291af6a28c6ba64113120efdf84a785e816c.tar.bz2 android_packages_apps_Trebuchet-56d8291af6a28c6ba64113120efdf84a785e816c.zip |
Apps on SD card don't confuse the launcher any more. They show up properly after reboots,
mounting and unmounting.
Change-Id: Icd861dcd8ac6401c597e2f9c8e2c66dff1cf9c61
Diffstat (limited to 'src/com/android/launcher2/ShortcutInfo.java')
-rw-r--r-- | src/com/android/launcher2/ShortcutInfo.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/launcher2/ShortcutInfo.java b/src/com/android/launcher2/ShortcutInfo.java index cb73ac05b..6e2d767d8 100644 --- a/src/com/android/launcher2/ShortcutInfo.java +++ b/src/com/android/launcher2/ShortcutInfo.java @@ -48,6 +48,17 @@ class ShortcutInfo extends ItemInfo { boolean customIcon; /** + * Indicates whether we're using the default fallback icon instead of something from the + * app. + */ + 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. */ @@ -122,9 +133,11 @@ class ShortcutInfo extends ItemInfo { if (customIcon) { values.put(LauncherSettings.BaseLauncherColumns.ICON_TYPE, LauncherSettings.BaseLauncherColumns.ICON_TYPE_BITMAP); - Bitmap bitmap = this.mIcon; - writeBitmap(values, bitmap); + writeBitmap(values, mIcon); } else { + if (onExternalStorage && !usingFallbackIcon) { + writeBitmap(values, mIcon); + } values.put(LauncherSettings.BaseLauncherColumns.ICON_TYPE, LauncherSettings.BaseLauncherColumns.ICON_TYPE_RESOURCE); if (iconResource != null) { |