diff options
| author | Danny Baumann <dannybaumann@web.de> | 2014-06-23 07:24:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-23 07:24:56 +0000 |
| commit | 0af448910082bc5f004607ba6cba20a9ed712e68 (patch) | |
| tree | ae7143ab407fb31ede71c595aa87e666e293c7c8 | |
| parent | cb871ad54b071274e69b05013fbaed0ba0d38947 (diff) | |
| parent | 01665d05035d5753ce5ed1bbec80e8d6dc2b2eaf (diff) | |
| download | android_packages_apps_Contacts-0af448910082bc5f004607ba6cba20a9ed712e68.tar.gz android_packages_apps_Contacts-0af448910082bc5f004607ba6cba20a9ed712e68.tar.bz2 android_packages_apps_Contacts-0af448910082bc5f004607ba6cba20a9ed712e68.zip | |
Merge "quickcontact: fallback to default secondary action drawable" into cm-11.0
| -rw-r--r-- | src/com/android/contacts/quickcontact/DataAction.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/contacts/quickcontact/DataAction.java b/src/com/android/contacts/quickcontact/DataAction.java index 13025576a..4f7777a23 100644 --- a/src/com/android/contacts/quickcontact/DataAction.java +++ b/src/com/android/contacts/quickcontact/DataAction.java @@ -283,12 +283,15 @@ public class DataAction implements Action { if (mAlternateIconRes == 0) return null; final String resourcePackageName = mKind.resourcePackageName; - if (resourcePackageName == null) { - return mContext.getResources().getDrawable(mAlternateIconRes); + if (resourcePackageName != null) { + final PackageManager pm = mContext.getPackageManager(); + Drawable dw = pm.getDrawable(resourcePackageName, mAlternateIconRes, null); + if (dw != null) { + return dw; + } } - final PackageManager pm = mContext.getPackageManager(); - return pm.getDrawable(resourcePackageName, mAlternateIconRes, null); + return mContext.getResources().getDrawable(mAlternateIconRes); } @Override |