diff options
author | Joe Onorato <joeo@android.com> | 2010-02-08 13:44:00 -0800 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-02-12 12:18:40 -0500 |
commit | 0589f0f66ce498512c6ee47482c649d88294c9d0 (patch) | |
tree | 42d42799a5578bde35a79b18ab8b28d301c663fe /src/com/android/launcher2/LiveFolderAdapter.java | |
parent | 3e244cf9d2da4fb04ef095f8b752a2a2c6e2f287 (diff) | |
download | android_packages_apps_Trebuchet-0589f0f66ce498512c6ee47482c649d88294c9d0.tar.gz android_packages_apps_Trebuchet-0589f0f66ce498512c6ee47482c649d88294c9d0.tar.bz2 android_packages_apps_Trebuchet-0589f0f66ce498512c6ee47482c649d88294c9d0.zip |
Split ApplicationInfo into ApplicationInfo which is used for AllAppsView and ShortcutInfo which is
used for the workspace.
Consolidate the three icon resampling functions into one.
Ensure that the icons stored in LauncherProvider are the right size, so we don't have to resample
them each time we load them.
Diffstat (limited to 'src/com/android/launcher2/LiveFolderAdapter.java')
-rw-r--r-- | src/com/android/launcher2/LiveFolderAdapter.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher2/LiveFolderAdapter.java b/src/com/android/launcher2/LiveFolderAdapter.java index b0e9eff1f..58b43e33a 100644 --- a/src/com/android/launcher2/LiveFolderAdapter.java +++ b/src/com/android/launcher2/LiveFolderAdapter.java @@ -141,7 +141,12 @@ class LiveFolderAdapter extends CursorAdapter { if (icon == null) { final Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length); - icon = new FastBitmapDrawable(Utilities.createBitmapThumbnail(bitmap, mContext)); + final Bitmap resampled = Utilities.resampleIconBitmap(bitmap, mContext); + if (bitmap != resampled) { + // If we got back a different object, we don't need the old one any more. + bitmap.recycle(); + } + icon = new FastBitmapDrawable(resampled); mCustomIcons.put(holder.id, new SoftReference<Drawable>(icon)); } } else if (holder.iconResourceIndex != -1 && holder.iconPackageIndex != -1) { @@ -154,7 +159,8 @@ class LiveFolderAdapter extends CursorAdapter { cursor.getString(holder.iconPackageIndex)); final int id = resources.getIdentifier(resource, null, null); - icon = Utilities.createIconThumbnail(resources.getDrawable(id), mContext); + icon = new FastBitmapDrawable( + Utilities.createIconBitmap(resources.getDrawable(id), mContext)); mIcons.put(resource, icon); } catch (Exception e) { // Ignore |