diff options
author | Michael Jurka <mikejurka@google.com> | 2011-07-11 16:07:05 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-11 16:07:05 -0700 |
commit | 3818eaf848cce0916a8650ce49d89ec0564c3bc0 (patch) | |
tree | 4e41bc6a079e0879a07cbfe61e79ab6e66e924d4 | |
parent | 51e95039ac40f94de024413a6e7fb1e18d41ef19 (diff) | |
parent | c85ea570c488ee5875da78ce011abeb6942b1990 (diff) | |
download | android_packages_apps_Trebuchet-3818eaf848cce0916a8650ce49d89ec0564c3bc0.tar.gz android_packages_apps_Trebuchet-3818eaf848cce0916a8650ce49d89ec0564c3bc0.tar.bz2 android_packages_apps_Trebuchet-3818eaf848cce0916a8650ce49d89ec0564c3bc0.zip |
Merge "No longer generating title bitmaps for icons."
-rw-r--r-- | src/com/android/launcher2/ApplicationInfo.java | 9 | ||||
-rw-r--r-- | src/com/android/launcher2/IconCache.java | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java index 1d948b738..ac571eaba 100644 --- a/src/com/android/launcher2/ApplicationInfo.java +++ b/src/com/android/launcher2/ApplicationInfo.java @@ -38,11 +38,6 @@ class ApplicationInfo extends ItemInfo { CharSequence title; /** - * A bitmap of the application's text in the bubble. - */ - Bitmap titleBitmap; - - /** * The intent used to start the application. */ Intent intent; @@ -129,8 +124,8 @@ class ApplicationInfo extends ItemInfo { ArrayList<ApplicationInfo> list) { Log.d(tag, label + " size=" + list.size()); for (ApplicationInfo info: list) { - Log.d(tag, " title=\"" + info.title + "\" titleBitmap=" + info.titleBitmap - + " iconBitmap=" + info.iconBitmap + " firstInstallTime=" + Log.d(tag, " title=\"" + info.title + "\" iconBitmap=" + + info.iconBitmap + " firstInstallTime=" + info.firstInstallTime); } } diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 22691a503..bf6caee91 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -40,7 +40,6 @@ public class IconCache { private static class CacheEntry { public Bitmap icon; public String title; - public Bitmap titleBitmap; } private final Bitmap mDefaultIcon; @@ -129,12 +128,8 @@ public class IconCache { public void getTitleAndIcon(ApplicationInfo application, ResolveInfo info) { synchronized (mCache) { CacheEntry entry = cacheLocked(application.componentName, info); - if (entry.titleBitmap == null) { - entry.titleBitmap = mBubble.createTextBitmap(entry.title); - } application.title = entry.title; - application.titleBitmap = entry.titleBitmap; application.iconBitmap = entry.icon; } } |