From 6f613d2999d53bc9e6183ad9d51b077a5d0f9552 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Sat, 31 Oct 2009 19:50:30 -0400
Subject: [PATCH] Fix bugs 2218563 and 2176751 - Not properly loading icons,
 and sometimes marking them as cached when they're not.

---
 src/com/android/launcher2/AppInfoCache.java        | 1 -
 src/com/android/launcher2/ApplicationsAdapter.java | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/AppInfoCache.java b/src/com/android/launcher2/AppInfoCache.java
index f89e3abfbf..2fdfc284ad 100644
--- a/src/com/android/launcher2/AppInfoCache.java
+++ b/src/com/android/launcher2/AppInfoCache.java
@@ -169,7 +169,6 @@ public class AppInfoCache {
 
         application.iconBitmap = Utilities.createAllAppsBitmap(
                 info.activityInfo.loadIcon(packageManager), context);
-        application.filtered = true;
 
         application.titleBitmap = bubble.createTextBitmap(application.title.toString());
     }
diff --git a/src/com/android/launcher2/ApplicationsAdapter.java b/src/com/android/launcher2/ApplicationsAdapter.java
index 489f546958..129103af08 100644
--- a/src/com/android/launcher2/ApplicationsAdapter.java
+++ b/src/com/android/launcher2/ApplicationsAdapter.java
@@ -17,6 +17,7 @@
 package com.android.launcher2;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,9 +31,11 @@ import java.util.ArrayList;
  */
 public class ApplicationsAdapter  extends ArrayAdapter<ApplicationInfo> {
     private final LayoutInflater mInflater;
+    private final PackageManager mPackageManager;
 
     public ApplicationsAdapter(Context context, ArrayList<ApplicationInfo> apps) {
         super(context, 0, apps);
+        mPackageManager = context.getPackageManager();
         mInflater = LayoutInflater.from(context);
     }
 
@@ -44,6 +47,9 @@ public class ApplicationsAdapter  extends ArrayAdapter<ApplicationInfo> {
             convertView = mInflater.inflate(R.layout.application_boxed, parent, false);
         }
 
+        if (info.icon == null) {
+            info.icon = AppInfoCache.getIconDrawable(mPackageManager, info);
+        }
         if (!info.filtered) {
             info.icon = Utilities.createIconThumbnail(info.icon, getContext());
             info.filtered = true;