diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-06 21:47:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-06 21:47:34 +0000 |
| commit | abd0dcd67ce2f448dab26cbb11de6263ba40e1cf (patch) | |
| tree | 505df3fffb3147adddf2f569e1d11def6c098bf0 /java/com/android/dialer/calllog/ui/menu/PrimaryAction.java | |
| parent | f7539b6d7f483462082370e9972edb5c5a9a0401 (diff) | |
| parent | 9e8b6733962641d137c4d084b843c069b6545953 (diff) | |
Merge "Covnert @AutoValue PhotoInfo into a proto."
Diffstat (limited to 'java/com/android/dialer/calllog/ui/menu/PrimaryAction.java')
| -rw-r--r-- | java/com/android/dialer/calllog/ui/menu/PrimaryAction.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java b/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java index de4a70c30..aec4dc6d8 100644 --- a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java +++ b/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java @@ -18,10 +18,12 @@ package com.android.dialer.calllog.ui.menu; import android.content.Context; import android.provider.CallLog.Calls; +import android.text.TextUtils; import com.android.dialer.calllog.model.CoalescedRow; import com.android.dialer.calllogutils.CallLogEntryText; import com.android.dialer.calllogutils.CallLogIntents; import com.android.dialer.calllogutils.NumberAttributesConverter; +import com.android.dialer.glidephotomanager.PhotoInfo; import com.android.dialer.historyitemactions.HistoryItemPrimaryActionInfo; /** Configures the primary action row (top row) for the bottom sheet. */ @@ -29,13 +31,17 @@ final class PrimaryAction { static HistoryItemPrimaryActionInfo fromRow(Context context, CoalescedRow row) { CharSequence primaryText = CallLogEntryText.buildPrimaryText(context, row); + + PhotoInfo.Builder photoInfoBuilder = + NumberAttributesConverter.toPhotoInfoBuilder(row.numberAttributes()) + .setIsVideo((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); + if (!TextUtils.isEmpty(row.formattedNumber())) { + photoInfoBuilder.setFormattedNumber(row.formattedNumber()); + } + return HistoryItemPrimaryActionInfo.builder() .setNumber(row.number()) - .setPhotoInfo( - NumberAttributesConverter.toPhotoInfoBuilder(row.numberAttributes()) - .setFormattedNumber(row.formattedNumber()) - .setIsVideo((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) - .build()) + .setPhotoInfo(photoInfoBuilder.build()) .setPrimaryText(primaryText) .setSecondaryText(CallLogEntryText.buildSecondaryTextForBottomSheet(context, row)) .setIntent(CallLogIntents.getCallBackIntent(context, row)) |