diff options
| author | twyen <twyen@google.com> | 2018-01-24 16:48:49 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-01-24 19:09:39 -0800 |
| commit | 0874af841f7e23357ceb2bb8825180b111d613b4 (patch) | |
| tree | 23982c4a353490aa0a605b0e04b8656def2a3775 /java/com/android/dialer/contactactions | |
| parent | 2a422f719b70f6c292b954fb24f324b7f4ac1858 (diff) | |
Show Icon and label for blocked numbers
CallLogPhoto.getPhotoUri() returns a URI to a drawable so it will be easier to transition into glide. Meanwhile ContactPhotoManager will just show the drawable directly.
Bug: 70989547
Test: Unit tests
PiperOrigin-RevId: 183163818
Change-Id: I4ee4ff98782e35d2be03dfe14f8bf3dfd6ded074
Diffstat (limited to 'java/com/android/dialer/contactactions')
| -rw-r--r-- | java/com/android/dialer/contactactions/ContactActionBottomSheet.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java index 7e216aaa1..27e318786 100644 --- a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java +++ b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java @@ -91,7 +91,7 @@ public class ContactActionBottomSheet extends BottomSheetDialog implements OnCli contactView.findViewById(R.id.quick_contact_photo), !TextUtils.isEmpty(photoInfo.lookupUri()) ? Uri.parse(photoInfo.lookupUri()) : null, photoInfo.photoId(), - !TextUtils.isEmpty(photoInfo.photoUri()) ? Uri.parse(photoInfo.photoUri()) : null, + photoInfo.photoUri(), photoInfo.displayName(), photoInfo.contactType()); diff --git a/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java b/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java index 2535f853d..f19fd282c 100644 --- a/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java +++ b/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java @@ -16,6 +16,7 @@ package com.android.dialer.contactactions; import android.content.Intent; +import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.dialer.DialerPhoneNumber; @@ -40,7 +41,7 @@ public abstract class ContactPrimaryActionInfo { public abstract long photoId(); @Nullable - public abstract String photoUri(); + public abstract Uri photoUri(); @Nullable public abstract String lookupUri(); @@ -60,7 +61,7 @@ public abstract class ContactPrimaryActionInfo { public abstract static class Builder { public abstract Builder setPhotoId(long photoId); - public abstract Builder setPhotoUri(@Nullable String photoUri); + public abstract Builder setPhotoUri(@Nullable Uri photoUri); public abstract Builder setLookupUri(@Nullable String lookupUri); |