diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-12 02:48:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-12 02:48:25 +0000 |
commit | 6bd659e6e90346f58ed08f6c127835a320bbd2e4 (patch) | |
tree | b90e5f582dcab0d3ad6393f4ffbc7a4dd78e81dc /java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java | |
parent | 58bade2ace277dff4db3bbbfa2e07015f0f7c6ad (diff) | |
parent | 01aac5de58903555a089d16a58b9346d34d54e7b (diff) |
Merge changes I2e091371,I4e0bc1c6,I24063ee4
* changes:
Implement PhoneLookup for CP2 remote contacts
Merge PhoneLookupDataSource results into a proto in annotated call log.
Attempt to place call even call permission is missing
Diffstat (limited to 'java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java')
-rw-r--r-- | java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java b/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java index 7f4ac8052..7b8adfe30 100644 --- a/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java +++ b/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java @@ -38,12 +38,12 @@ final class PrimaryAction { .setNumber(voicemailEntry.number()) .setPhotoInfo( PhotoInfo.builder() - .setPhotoId(voicemailEntry.photoId()) - .setPhotoUri(voicemailEntry.photoUri()) + .setPhotoId(voicemailEntry.numberAttributes().getPhotoId()) + .setPhotoUri(voicemailEntry.numberAttributes().getPhotoUri()) .setIsVideo(false) .setContactType( LetterTileDrawable.TYPE_DEFAULT) // TODO(uabdullah): Use proper type. - .setDisplayName(voicemailEntry.name()) + .setDisplayName(voicemailEntry.numberAttributes().getName()) .build()) .setPrimaryText(buildPrimaryVoicemailText(context, voicemailEntry)) .setSecondaryText(buildSecondaryVoicemailText(voicemailEntry)) @@ -56,8 +56,8 @@ final class PrimaryAction { public static String buildPrimaryVoicemailText(Context context, VoicemailEntry data) { StringBuilder primaryText = new StringBuilder(); - if (!TextUtils.isEmpty(data.name())) { - primaryText.append(data.name()); + if (!TextUtils.isEmpty(data.numberAttributes().getName())) { + primaryText.append(data.numberAttributes().getName()); } else if (!TextUtils.isEmpty(data.formattedNumber())) { primaryText.append(data.formattedNumber()); } else { |