commit de420b206cf070f9ee4ea2ada435b2a482cdaa79
author Winson Chung <winsonc@google.com> Fri Feb 14 20:52:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:52:18 2014 +0000
tree 2044f8f0c92364fb0b60e7d627d6dbaef3c83fd6
parent c251158e629cf49a199afd9d75ec44e0efd16ab7
parent ffed6aa2aff57cb6bd03fa7ae1268dcd0f2244e1

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

* commit 'ffed6aa2aff57cb6bd03fa7ae1268dcd0f2244e1':
  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);
     }