summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-16 13:53:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-16 13:53:57 -0700
commit6dec01caa1fc657138f868d4c9431a6c50d99590 (patch)
treec78bb807e13ef97b879a64aee4540f7bae08c3c1
parentbb84fa9ebfacdb5bf617db30873f6d9c65e75642 (diff)
parent5801ef048adea9ca1a2e31839b73655d3d258b21 (diff)
downloadandroid_packages_apps_Trebuchet-6dec01caa1fc657138f868d4c9431a6c50d99590.tar.gz
android_packages_apps_Trebuchet-6dec01caa1fc657138f868d4c9431a6c50d99590.tar.bz2
android_packages_apps_Trebuchet-6dec01caa1fc657138f868d4c9431a6c50d99590.zip
am 5801ef04: Lazy load default app icon in LauncherModel. (Bug 11203738)
* commit '5801ef048adea9ca1a2e31839b73655d3d258b21': Lazy load default app icon in LauncherModel. (Bug 11203738)
-rw-r--r--src/com/android/launcher3/LauncherModel.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 7e1442dce..aad768d36 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -186,9 +186,6 @@ public class LauncherModel extends BroadcastReceiver {
mBgAllAppsList = new AllAppsList(iconCache, appFilter);
mIconCache = iconCache;
- mDefaultIcon = Utilities.createIconBitmap(
- mIconCache.getFullResDefaultActivityIcon(), context);
-
final Resources res = context.getResources();
Configuration config = res.getConfiguration();
mPreviousConfigMcc = config.mcc;
@@ -400,6 +397,11 @@ public class LauncherModel extends BroadcastReceiver {
}
public Bitmap getFallbackIcon() {
+ if (mDefaultIcon == null) {
+ final Context context = LauncherAppState.getInstance().getContext();
+ mDefaultIcon = Utilities.createIconBitmap(
+ mIconCache.getFullResDefaultActivityIcon(), context);
+ }
return Bitmap.createBitmap(mDefaultIcon);
}