commit 6dec01caa1fc657138f868d4c9431a6c50d99590
author Winson Chung <winsonc@google.com> Wed Oct 16 13:53:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 16 13:53:57 2013 -0700
tree c78bb807e13ef97b879a64aee4540f7bae08c3c1
parent bb84fa9ebfacdb5bf617db30873f6d9c65e75642
parent 5801ef048adea9ca1a2e31839b73655d3d258b21

am 5801ef04: Lazy load default app icon in LauncherModel. (Bug 11203738)

* commit '5801ef048adea9ca1a2e31839b73655d3d258b21':
  Lazy load default app icon in LauncherModel. (Bug 11203738)

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 7e1442d..aad768d 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -186,9 +186,6 @@
         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 Bitmap getFallbackIcon() {
+        if (mDefaultIcon == null) {
+            final Context context = LauncherAppState.getInstance().getContext();
+            mDefaultIcon = Utilities.createIconBitmap(
+                    mIconCache.getFullResDefaultActivityIcon(), context);
+        }
         return Bitmap.createBitmap(mDefaultIcon);
     }