diff options
author | linyuh <linyuh@google.com> | 2018-02-14 09:46:57 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-22 01:23:13 -0800 |
commit | 86491a974ae881bdf66245d0bc31be1e743ae30e (patch) | |
tree | 412593851eddce4e7769ea6d8756827571d9752f /java/com/android/dialer/glidephotomanager | |
parent | e54764461b7833f5ebe34dafabdf8d9c3434ce37 (diff) |
Fix the icon & the label for blocked spam numbers in the new call log.
Bug: 73077158
Test: CallLogEntryTextTest, GlidePhotoManagerImplTest
PiperOrigin-RevId: 185700282
Change-Id: I292f23ea8bf9875d6378c8cc9e20ae6ca86e8827
Diffstat (limited to 'java/com/android/dialer/glidephotomanager')
-rw-r--r-- | java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java index c6d92057d..10c4dfb4c 100644 --- a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java +++ b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java @@ -68,13 +68,13 @@ public class GlidePhotoManagerImpl implements GlidePhotoManager { // Warning: Glide ignores extra attributes on BitmapDrawable such as tint and draw the bitmap // directly so be sure not to set tint in the XML of any drawable referenced below. - // The spam status takes precedence over whether the number is blocked. - if (photoInfo.isSpam()) { - return requestManager.load(R.drawable.ic_report_red_48dp); - } + // Whether the number is blocked takes precedence over the spam status. if (photoInfo.isBlocked()) { return requestManager.load(R.drawable.ic_block_grey_48dp); } + if (photoInfo.isSpam()) { + return requestManager.load(R.drawable.ic_report_red_48dp); + } if (!TextUtils.isEmpty(photoInfo.photoUri())) { return requestManager.load(parseUri(photoInfo.photoUri())); } |