From 00cdd7b552b3fde4c9cbc1c4e4d0edc1b54df365 Mon Sep 17 00:00:00 2001 From: linyuh Date: Fri, 18 May 2018 13:32:36 -0700 Subject: Remove duplicate code when constructing PhotoInfo proto. Bug: 79770053 Test: Existing tests PiperOrigin-RevId: 197192087 Change-Id: I44c60d13c83b3e23dc141fd9e9b88e108687bf96 --- .../android/dialer/calllog/ui/menu/BottomSheetHeader.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java') diff --git a/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java index 4e25cedf4..25ae47691 100644 --- a/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java +++ b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java @@ -17,11 +17,9 @@ package com.android.dialer.calllog.ui.menu; import android.content.Context; -import android.provider.CallLog.Calls; -import android.support.v4.os.BuildCompat; import com.android.dialer.calllog.model.CoalescedRow; import com.android.dialer.calllogutils.CallLogEntryText; -import com.android.dialer.calllogutils.NumberAttributesConverter; +import com.android.dialer.calllogutils.PhotoInfoBuilder; import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo; /** Configures the top row in the bottom sheet. */ @@ -30,15 +28,7 @@ final class BottomSheetHeader { static HistoryItemBottomSheetHeaderInfo fromRow(Context context, CoalescedRow row) { return HistoryItemBottomSheetHeaderInfo.newBuilder() .setNumber(row.getNumber()) - .setPhotoInfo( - NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) - .setFormattedNumber(row.getFormattedNumber()) - .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) - .setIsVoicemail(row.getIsVoicemailCall()) - .setIsRtt( - BuildCompat.isAtLeastP() - && (row.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT) - .build()) + .setPhotoInfo(PhotoInfoBuilder.fromCoalescedRow(row)) .setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString()) .setSecondaryText( CallLogEntryText.buildSecondaryTextForBottomSheet(context, row).toString()) -- cgit v1.2.3