diff options
author | linyuh <linyuh@google.com> | 2018-03-06 12:13:27 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-06 12:17:15 -0800 |
commit | 9e8b6733962641d137c4d084b843c069b6545953 (patch) | |
tree | 505df3fffb3147adddf2f569e1d11def6c098bf0 /java/com/android/dialer/voicemail | |
parent | f7539b6d7f483462082370e9972edb5c5a9a0401 (diff) |
Covnert @AutoValue PhotoInfo into a proto.
Bug: 74202944
Test: Existing tests
PiperOrigin-RevId: 188060790
Change-Id: I4d79a353abf767935383d4149f261f5e96fd7acb
Diffstat (limited to 'java/com/android/dialer/voicemail')
-rw-r--r-- | java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java | 13 | ||||
-rw-r--r-- | java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java | 12 |
2 files changed, 16 insertions, 9 deletions
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java index 5328dd33e..1d42e647a 100644 --- a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java +++ b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java @@ -45,6 +45,7 @@ import com.android.dialer.common.concurrent.DialerExecutor.Worker; import com.android.dialer.common.concurrent.DialerExecutorComponent; import com.android.dialer.compat.android.provider.VoicemailCompat; import com.android.dialer.glidephotomanager.GlidePhotoManager; +import com.android.dialer.glidephotomanager.PhotoInfo; import com.android.dialer.time.Clock; import com.android.dialer.voicemail.listui.menu.NewVoicemailMenu; import com.android.dialer.voicemail.model.VoicemailEntry; @@ -210,11 +211,13 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On } private void setPhoto(VoicemailEntry voicemailEntry) { - glidePhotoManager.loadQuickContactBadge( - quickContactBadge, - NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes()) - .setFormattedNumber(voicemailEntry.formattedNumber()) - .build()); + PhotoInfo.Builder photoInfoBuilder = + NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes()); + if (!TextUtils.isEmpty(voicemailEntry.formattedNumber())) { + photoInfoBuilder.setFormattedNumber(voicemailEntry.formattedNumber()); + } + + glidePhotoManager.loadQuickContactBadge(quickContactBadge, photoInfoBuilder.build()); } void collapseViewHolder() { diff --git a/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java b/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java index 9a5aa1886..dbc417c6c 100644 --- a/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java +++ b/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java @@ -19,6 +19,7 @@ package com.android.dialer.voicemail.listui.menu; import android.content.Context; import android.text.TextUtils; import com.android.dialer.calllogutils.NumberAttributesConverter; +import com.android.dialer.glidephotomanager.PhotoInfo; import com.android.dialer.historyitemactions.HistoryItemPrimaryActionInfo; import com.android.dialer.voicemail.model.VoicemailEntry; @@ -33,12 +34,15 @@ final class PrimaryAction { // setSecondaryText - check in with UX static HistoryItemPrimaryActionInfo fromVoicemailEntry( Context context, VoicemailEntry voicemailEntry) { + PhotoInfo.Builder photoInfoBuilder = + NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes()); + if (!TextUtils.isEmpty(voicemailEntry.formattedNumber())) { + photoInfoBuilder.setFormattedNumber(voicemailEntry.formattedNumber()); + } + return HistoryItemPrimaryActionInfo.builder() .setNumber(voicemailEntry.number()) - .setPhotoInfo( - NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes()) - .setFormattedNumber(voicemailEntry.formattedNumber()) - .build()) + .setPhotoInfo(photoInfoBuilder.build()) .setPrimaryText(buildPrimaryVoicemailText(context, voicemailEntry)) .setSecondaryText(buildSecondaryVoicemailText(voicemailEntry)) .build(); |