commit 5308f24d4b66b020202b88eff672f5a89096ebb6
author Winson Chung <winsonc@google.com> Thu Aug 18 12:12:41 2011 -0700
committer Winson Chung <winsonc@google.com> Thu Aug 18 12:15:28 2011 -0700
tree 6c7e9f4c633cd3e7d2bef552c2e53fc3951f6c9c
parent c273c5814d7b312628107ad4a7bff9cc64e89eae

Fixing label cache issue due to different ResolveInfos being returned in different parts of loading, saves 1-10% on AllApps load. (5042022)

Change-Id: I17166bd6a50858ff76c475688fff9a9eaeba6010

src/com/android/launcher2/IconCache.java

diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index b2ebe2a..247e164 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher2/IconCache.java
@@ -183,12 +183,13 @@
 
             mCache.put(componentName, entry);
 
-            if (labelCache != null && labelCache.containsKey(info)) {
-                entry.title = labelCache.get(info).toString();
+            ComponentName key = LauncherModel.getComponentNameFromResolveInfo(info);
+            if (labelCache != null && labelCache.containsKey(key)) {
+                entry.title = labelCache.get(key).toString();
             } else {
                 entry.title = info.loadLabel(mPackageManager).toString();
                 if (labelCache != null) {
-                    labelCache.put(info, entry.title);
+                    labelCache.put(key, entry.title);
                 }
             }
             if (entry.title == null) {