Merge "Remove duplicate code when constructing PhotoInfo proto." (b327b636) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.Ann
		import com.android.dialer.calllog.datasources.CallLogDataSource;
		import com.android.dialer.calllog.datasources.CallLogMutations;
		import com.android.dialer.calllog.datasources.util.RowCombiner;
		import com.android.dialer.calllogutils.NumberAttributesConverter;
		import com.android.dialer.calllogutils.NumberAttributesBuilder;
		import com.android.dialer.common.Assert;
		import com.android.dialer.common.LogUtil;
		import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
		@@ -598,6 +598,6 @@ public final class PhoneLookupDataSource implements CallLogDataSource {
		private void updateContentValues(ContentValues contentValues, PhoneLookupInfo phoneLookupInfo) {
		contentValues.put(
		AnnotatedCallLog.NUMBER_ATTRIBUTES,
		NumberAttributesConverter.fromPhoneLookupInfo(phoneLookupInfo).build().toByteArray());
		NumberAttributesBuilder.fromPhoneLookupInfo(phoneLookupInfo).build().toByteArray());
		}
		}

java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java

+2 −11

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.database.Cursor;
		import android.provider.CallLog.Calls;
		import android.support.annotation.ColorInt;
		import android.support.annotation.DrawableRes;
		import android.support.v4.os.BuildCompat;
		import android.support.v7.widget.RecyclerView;
		import android.telecom.PhoneAccount;
		import android.telecom.PhoneAccountHandle;
		@@ -35,8 +34,8 @@ import com.android.dialer.calllog.ui.NewCallLogAdapter.PopCounts;
		import com.android.dialer.calllog.ui.menu.NewCallLogMenu;
		import com.android.dialer.calllogutils.CallLogEntryText;
		import com.android.dialer.calllogutils.CallLogRowActions;
		import com.android.dialer.calllogutils.NumberAttributesConverter;
		import com.android.dialer.calllogutils.PhoneAccountUtils;
		import com.android.dialer.calllogutils.PhotoInfoBuilder;
		import com.android.dialer.common.concurrent.DialerExecutorComponent;
		import com.android.dialer.compat.AppCompatConstants;
		import com.android.dialer.compat.telephony.TelephonyManagerCompat;
		@@ -162,15 +161,7 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder {
		}

		private void setPhoto(CoalescedRow row) {
		contactPhotoView.setPhoto(
		NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes())
		.setFormattedNumber(row.getFormattedNumber())
		.setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
		.setIsRtt(
		BuildCompat.isAtLeastP()
		&& (row.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT)
		.setIsVoicemail(row.getIsVoicemailCall())
		.build());
		contactPhotoView.setPhoto(PhotoInfoBuilder.fromCoalescedRow(row).build());
		}

		private void setFeatureIcons(CoalescedRow row) {

java/com/android/dialer/calllog/ui/RealtimeRowProcessor.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.support.annotation.VisibleForTesting;
		import android.util.ArrayMap;
		import com.android.dialer.DialerPhoneNumber;
		import com.android.dialer.calllog.model.CoalescedRow;
		import com.android.dialer.calllogutils.NumberAttributesConverter;
		import com.android.dialer.calllogutils.NumberAttributesBuilder;
		import com.android.dialer.common.Assert;
		import com.android.dialer.common.LogUtil;
		import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
		@@ -203,7 +203,7 @@ public final class RealtimeRowProcessor {
		// TODO(linyuh): Improve the comparison instead.
		return row.toBuilder()
		.setNumberAttributes(
		NumberAttributesConverter.fromPhoneLookupInfo(phoneLookupInfo)
		NumberAttributesBuilder.fromPhoneLookupInfo(phoneLookupInfo)
		.setIsCp2InfoIncomplete(row.getNumberAttributes().getIsCp2InfoIncomplete())
		.build())
		.build();

java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -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())

java/com/android/dialer/calllog/ui/menu/Modules.java

+2 −16

Original line number	Diff line number	Diff line
		@@ -17,15 +17,12 @@
		package com.android.dialer.calllog.ui.menu;

		import android.content.Context;
		import android.provider.CallLog.Calls;
		import android.support.v4.os.BuildCompat;
		import android.text.TextUtils;
		import com.android.dialer.calldetails.CallDetailsActivity;
		import com.android.dialer.calldetails.CallDetailsHeaderInfo;
		import com.android.dialer.calllog.model.CoalescedRow;
		import com.android.dialer.calllogutils.CallLogEntryText;
		import com.android.dialer.calllogutils.NumberAttributesConverter;
		import com.android.dialer.glidephotomanager.PhotoInfo;
		import com.android.dialer.calllogutils.PhotoInfoBuilder;
		import com.android.dialer.historyitemactions.HistoryItemActionModule;
		import com.android.dialer.historyitemactions.HistoryItemActionModuleInfo;
		import com.android.dialer.historyitemactions.HistoryItemActionModulesBuilder;
		@@ -91,24 +88,13 @@ final class Modules {
		Context context, CoalescedRow row) {
		return CallDetailsHeaderInfo.newBuilder()
		.setDialerPhoneNumber(row.getNumber())
		.setPhotoInfo(createPhotoInfoFromRow(row))
		.setPhotoInfo(PhotoInfoBuilder.fromCoalescedRow(row))
		.setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString())
		.setSecondaryText(
		CallLogEntryText.buildSecondaryTextForBottomSheet(context, row).toString())
		.build();
		}

		private static PhotoInfo createPhotoInfoFromRow(CoalescedRow row) {
		return NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes())
		.setFormattedNumber(row.getFormattedNumber())
		.setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
		.setIsRtt(
		BuildCompat.isAtLeastP()
		&& (row.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT)
		.setIsVoicemail(row.getIsVoicemailCall())
		.build();
		}

		private static boolean canSupportAssistedDialing(CoalescedRow row) {
		return !TextUtils.isEmpty(row.getNumberAttributes().getLookupUri());
		}