commit 7f7b0c759e2970178ef68805b21f06a26e24eb76
author Nicolas Prevot <nprevot@google.com> Mon Jun 23 15:59:38 2014 +0100
committer Nicolas Prevot <nprevot@google.com> Wed Jul 02 12:09:51 2014 +0100
tree ed54685cced5cf9f6495ca9194595eb6edc8ff8d
parent 160a6e5b99de15ce755e2e5521dce32d81ab180a

Returning badged icons for components of corporate apps.

So, corporate apps in disambiguation dialogs are badged.
And updating the way we show the icon of the personal space to this new design.

BUG: 14377051

Change-Id: Idc707773a64a8feb2d9d4df88c425d5100542636

core/java/android/content/pm/ResolveInfo.java

diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java
index 1f9d60c..fe3aec9 100644
--- a/core/java/android/content/pm/ResolveInfo.java
+++ b/core/java/android/content/pm/ResolveInfo.java
@@ -19,8 +19,6 @@
 import android.content.ComponentName;
 import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.UserHandle;
@@ -136,10 +134,9 @@
     public int targetUserId;
 
     /**
-     * If true, then loadIcon will return the icon of the target user.
      * @hide
      */
-    public boolean showTargetUserIcon;
+    public boolean noResourceId;
 
     /**
      * @hide Target comes from system process?
@@ -217,10 +214,6 @@
                 return dr;
             }
         }
-        if (showTargetUserIcon) {
-            Bitmap bm = pm.getUserIcon(targetUserId);
-            return new BitmapDrawable(bm);
-        }
         return ci.loadIcon(pm);
     }
     
@@ -232,9 +225,10 @@
      * @return The icon associated with this match.
      */
     public final int getIconResource() {
+        if (noResourceId) return 0;
         if (icon != 0) return icon;
         final ComponentInfo ci = getComponentInfo();
-        if (ci != null && !showTargetUserIcon) {
+        if (ci != null) {
             return ci.getIconResource();
         }
         return 0;
@@ -312,9 +306,6 @@
             sb.append(" targetUserId=");
             sb.append(targetUserId);
         }
-        if (showTargetUserIcon) {
-            sb.append(" [showTargetUserIcon]");
-        }
         sb.append('}');
         return sb.toString();
     }
@@ -351,8 +342,8 @@
         dest.writeInt(icon);
         dest.writeString(resolvePackageName);
         dest.writeInt(targetUserId);
-        dest.writeInt(showTargetUserIcon ? 1 : 0);
         dest.writeInt(system ? 1 : 0);
+        dest.writeInt(noResourceId ? 1 : 0);
     }
 
     public static final Creator<ResolveInfo> CREATOR
@@ -396,8 +387,8 @@
         icon = source.readInt();
         resolvePackageName = source.readString();
         targetUserId = source.readInt();
-        showTargetUserIcon = source.readInt() != 0;
         system = source.readInt() != 0;
+        noResourceId = source.readInt() != 0;
     }
     
     public static class DisplayNameComparator