diff options
Diffstat (limited to 'java/com/android/contacts/common/ContactPhotoManager.java')
| -rw-r--r-- | java/com/android/contacts/common/ContactPhotoManager.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/com/android/contacts/common/ContactPhotoManager.java b/java/com/android/contacts/common/ContactPhotoManager.java index 9e627ae1f..652e93637 100644 --- a/java/com/android/contacts/common/ContactPhotoManager.java +++ b/java/com/android/contacts/common/ContactPhotoManager.java @@ -39,6 +39,7 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { /** Contact type constants used for default letter images */ public static final int TYPE_PERSON = LetterTileDrawable.TYPE_PERSON; + public static final int TYPE_SPAM = LetterTileDrawable.TYPE_SPAM; public static final int TYPE_BUSINESS = LetterTileDrawable.TYPE_BUSINESS; public static final int TYPE_VOICEMAIL = LetterTileDrawable.TYPE_VOICEMAIL; public static final int TYPE_DEFAULT = LetterTileDrawable.TYPE_DEFAULT; @@ -235,8 +236,13 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { loadThumbnail(view, photoId, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR); } - public final void loadDialerThumbnail( - QuickContactBadge badge, Uri contactUri, long photoId, String displayName, int contactType) { + public final void loadDialerThumbnailOrPhoto( + QuickContactBadge badge, + Uri contactUri, + long photoId, + Uri photoUri, + String displayName, + int contactType) { badge.assignContactUri(contactUri); badge.setOverlay(null); @@ -244,8 +250,11 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { ContactPhotoManager.DefaultImageRequest request = new ContactPhotoManager.DefaultImageRequest( displayName, lookupKey, contactType, true /* isCircular */); - loadThumbnail( - badge, photoId, false /* darkTheme */, true /* isCircular */, request, DEFAULT_AVATAR); + if (photoId == 0 && photoUri != null) { + loadDirectoryPhoto(badge, photoUri, false /* darkTheme */, true /* isCircular */, request); + } else { + loadThumbnail(badge, photoId, false /* darkTheme */, true /* isCircular */, request); + } } /** @@ -500,4 +509,3 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { } } } - |