commit 7a9ff812f37a2c8d503a1abeea3337a6689f0ac6
author Walter Jang <wjang@google.com> Fri Oct 02 18:52:17 2015 -0700
committer Walter Jang <wjang@google.com> Sun Oct 04 09:54:05 2015 -0700
tree 309e9780a803f7918261bb8a4b281e641445a897
parent c1f2724b1ac3120f160e2513ef07e31eec0e6ae8

Compact editor photo picker 2/2 (E15)

Expose static method to get an AccountType Drawable
from the underlying resource IDs and sync adapter
package names.

Bug 19697372
Bug 23589603

Change-Id: I57ab4090ce13618c292c9d267f1735135f8fc950

src/com/android/contacts/common/model/account/AccountType.java

diff --git a/src/com/android/contacts/common/model/account/AccountType.java b/src/com/android/contacts/common/model/account/AccountType.java
index 53ab47d..8b50d79 100644
--- a/src/com/android/contacts/common/model/account/AccountType.java
+++ b/src/com/android/contacts/common/model/account/AccountType.java
@@ -277,11 +277,16 @@
     }
 
     public Drawable getDisplayIcon(Context context) {
-        if (this.titleRes != -1 && this.syncAdapterPackageName != null) {
+        return getDisplayIcon(context, titleRes, iconRes, syncAdapterPackageName);
+    }
+
+    public static Drawable getDisplayIcon(Context context, int titleRes, int iconRes,
+            String syncAdapterPackageName) {
+        if (titleRes != -1 && syncAdapterPackageName != null) {
             final PackageManager pm = context.getPackageManager();
-            return pm.getDrawable(this.syncAdapterPackageName, this.iconRes, null);
-        } else if (this.titleRes != -1) {
-            return context.getResources().getDrawable(this.iconRes);
+            return pm.getDrawable(syncAdapterPackageName, iconRes, null);
+        } else if (titleRes != -1) {
+            return context.getResources().getDrawable(iconRes);
         } else {
             return null;
         }