diff options
author | Winson Chung <winsonc@google.com> | 2011-07-11 17:44:15 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-07-11 17:47:42 -0700 |
commit | c3eecff9043759926df124483b45fe8f4436ae7c (patch) | |
tree | 0c2933a6834c04f9cc6b8402e01caca282a8c28a /src/com/android/launcher2/ApplicationInfo.java | |
parent | 3818eaf848cce0916a8650ce49d89ec0564c3bc0 (diff) | |
download | android_packages_apps_Trebuchet-c3eecff9043759926df124483b45fe8f4436ae7c.tar.gz android_packages_apps_Trebuchet-c3eecff9043759926df124483b45fe8f4436ae7c.tar.bz2 android_packages_apps_Trebuchet-c3eecff9043759926df124483b45fe8f4436ae7c.zip |
Preventing multiple calls to loadLabel for the same info within a single load.
- Fixing mind boggling bug where we weren't even using the label cache earlier.
Change-Id: I605abf4d589ad02b2426d20adfe9cd1773cc84fd
Diffstat (limited to 'src/com/android/launcher2/ApplicationInfo.java')
-rw-r--r-- | src/com/android/launcher2/ApplicationInfo.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java index ac571eaba..1fc1d1f55 100644 --- a/src/com/android/launcher2/ApplicationInfo.java +++ b/src/com/android/launcher2/ApplicationInfo.java @@ -19,12 +19,13 @@ package com.android.launcher2; import android.content.ComponentName; import android.content.Intent; import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.ResolveInfo; import android.graphics.Bitmap; import android.util.Log; import java.util.ArrayList; +import java.util.HashMap; /** * Represents an app in AllAppsView. @@ -66,7 +67,8 @@ class ApplicationInfo extends ItemInfo { /** * Must not hold the Context. */ - public ApplicationInfo(PackageManager pm, ResolveInfo info, IconCache iconCache) { + public ApplicationInfo(PackageManager pm, ResolveInfo info, IconCache iconCache, + HashMap<Object, CharSequence> labelCache) { final String packageName = info.activityInfo.applicationInfo.packageName; this.componentName = new ComponentName(packageName, info.activityInfo.name); @@ -88,9 +90,9 @@ class ApplicationInfo extends ItemInfo { Log.d(TAG, "PackageManager.getApplicationInfo failed for " + packageName); } - iconCache.getTitleAndIcon(this, info); + iconCache.getTitleAndIcon(this, info, labelCache); } - + public ApplicationInfo(ApplicationInfo info) { super(info); componentName = info.componentName; |