diff options
Diffstat (limited to 'java/com/android/dialer/calllog/ui/menu')
3 files changed, 37 insertions, 44 deletions
diff --git a/java/com/android/dialer/calllog/ui/menu/Modules.java b/java/com/android/dialer/calllog/ui/menu/Modules.java index 69b42e304..aeb69a7a8 100644 --- a/java/com/android/dialer/calllog/ui/menu/Modules.java +++ b/java/com/android/dialer/calllog/ui/menu/Modules.java @@ -51,15 +51,15 @@ final class Modules { // Conditionally add each module, which are items in the bottom sheet's menu. List<HistoryItemActionModule> modules = new ArrayList<>(); - String normalizedNumber = row.number().getNormalizedNumber(); + String normalizedNumber = row.getNumber().getNormalizedNumber(); boolean canPlaceCalls = - PhoneNumberHelper.canPlaceCallsTo(normalizedNumber, row.numberPresentation()); + PhoneNumberHelper.canPlaceCallsTo(normalizedNumber, row.getNumberPresentation()); if (canPlaceCalls) { modules.addAll(createModulesForCalls(context, row, normalizedNumber)); Optional<HistoryItemActionModule> moduleForSendingTextMessage = SharedModules.createModuleForSendingTextMessage( - context, normalizedNumber, row.numberAttributes().getIsBlocked()); + context, normalizedNumber, row.getNumberAttributes().getIsBlocked()); if (moduleForSendingTextMessage.isPresent()) { modules.add(moduleForSendingTextMessage.get()); } @@ -76,29 +76,29 @@ final class Modules { Optional<HistoryItemActionModule> moduleForAddingToContacts = SharedModules.createModuleForAddingToContacts( context, - row.number(), - row.numberAttributes().getName(), - row.numberAttributes().getLookupUri(), - row.numberAttributes().getIsBlocked(), - row.numberAttributes().getIsSpam()); + row.getNumber(), + row.getNumberAttributes().getName(), + row.getNumberAttributes().getLookupUri(), + row.getNumberAttributes().getIsBlocked(), + row.getNumberAttributes().getIsSpam()); if (moduleForAddingToContacts.isPresent()) { modules.add(moduleForAddingToContacts.get()); } BlockReportSpamDialogInfo blockReportSpamDialogInfo = BlockReportSpamDialogInfo.newBuilder() - .setNormalizedNumber(row.number().getNormalizedNumber()) - .setCountryIso(row.number().getCountryIso()) - .setCallType(row.callType()) + .setNormalizedNumber(row.getNumber().getNormalizedNumber()) + .setCountryIso(row.getNumber().getCountryIso()) + .setCallType(row.getCallType()) .setReportingLocation(ReportingLocation.Type.CALL_LOG_HISTORY) - .setContactSource(row.numberAttributes().getContactSource()) + .setContactSource(row.getNumberAttributes().getContactSource()) .build(); modules.addAll( SharedModules.createModulesHandlingBlockedOrSpamNumber( context, blockReportSpamDialogInfo, - row.numberAttributes().getIsBlocked(), - row.numberAttributes().getIsSpam())); + row.getNumberAttributes().getIsBlocked(), + row.getNumberAttributes().getIsSpam())); Optional<HistoryItemActionModule> moduleForCopyingNumber = SharedModules.createModuleForCopyingNumber(context, normalizedNumber); @@ -109,7 +109,7 @@ final class Modules { modules.add(createModuleForAccessingCallDetails(context, row)); - modules.add(new DeleteCallLogItemModule(context, row.coalescedIds())); + modules.add(new DeleteCallLogItemModule(context, row.getCoalescedIds())); return modules; } @@ -117,14 +117,14 @@ final class Modules { private static List<HistoryItemActionModule> createModulesForCalls( Context context, CoalescedRow row, String normalizedNumber) { // Don't add call options if a number is blocked. - if (row.numberAttributes().getIsBlocked()) { + if (row.getNumberAttributes().getIsBlocked()) { return Collections.emptyList(); } List<HistoryItemActionModule> modules = new ArrayList<>(); PhoneAccountHandle phoneAccountHandle = TelecomUtil.composePhoneAccountHandle( - row.phoneAccountComponentName(), row.phoneAccountId()); + row.getPhoneAccountComponentName(), row.getPhoneAccountId()); // Add an audio call item modules.add( @@ -132,8 +132,8 @@ final class Modules { context, normalizedNumber, phoneAccountHandle, CallInitiationType.Type.CALL_LOG)); // Add a video item if (1) the call log entry is for a video call, and (2) the call is not spam. - if ((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO - && !row.numberAttributes().getIsSpam()) { + if ((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO + && !row.getNumberAttributes().getIsSpam()) { modules.add( IntentModule.newVideoCallModule( context, normalizedNumber, phoneAccountHandle, CallInitiationType.Type.CALL_LOG)); @@ -147,14 +147,15 @@ final class Modules { private static HistoryItemActionModule createModuleForAccessingCallDetails( Context context, CoalescedRow row) { - boolean canReportAsInvalidNumber = row.numberAttributes().getCanReportAsInvalidNumber(); - boolean canSupportAssistedDialing = !TextUtils.isEmpty(row.numberAttributes().getLookupUri()); + boolean canReportAsInvalidNumber = row.getNumberAttributes().getCanReportAsInvalidNumber(); + boolean canSupportAssistedDialing = + !TextUtils.isEmpty(row.getNumberAttributes().getLookupUri()); return new IntentModule( context, CallDetailsActivity.newInstance( context, - row.coalescedIds(), + row.getCoalescedIds(), createCallDetailsHeaderInfoFromRow(context, row), canReportAsInvalidNumber, canSupportAssistedDialing), @@ -165,7 +166,7 @@ final class Modules { private static CallDetailsHeaderInfo createCallDetailsHeaderInfoFromRow( Context context, CoalescedRow row) { return CallDetailsHeaderInfo.newBuilder() - .setDialerPhoneNumber(row.number()) + .setDialerPhoneNumber(row.getNumber()) .setPhotoInfo(createPhotoInfoFromRow(row)) .setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString()) .setSecondaryText( @@ -174,13 +175,10 @@ final class Modules { } private static PhotoInfo createPhotoInfoFromRow(CoalescedRow row) { - PhotoInfo.Builder photoInfoBuilder = - NumberAttributesConverter.toPhotoInfoBuilder(row.numberAttributes()) - .setIsVideo((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) - .setIsVoicemail(row.isVoicemailCall()); - if (!TextUtils.isEmpty(row.formattedNumber())) { - photoInfoBuilder.setFormattedNumber(row.formattedNumber()); - } - return photoInfoBuilder.build(); + return NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) + .setFormattedNumber(row.getFormattedNumber()) + .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) + .setIsVoicemail(row.getIsVoicemailCall()) + .build(); } } diff --git a/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java b/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java index 9efe907e3..5be19ce0c 100644 --- a/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java +++ b/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java @@ -42,11 +42,11 @@ public final class NewCallLogMenu { // If the user opens the bottom sheet for a new call, clear the notifications and make the row // not bold immediately. To do this, mark all of the calls in group as not new. - if (row.isNew() && row.callType() == Calls.MISSED_TYPE) { + if (row.getIsNew() && row.getCallType() == Calls.MISSED_TYPE) { Futures.addCallback( CallLogComponent.get(context) .getClearMissedCalls() - .clearBySystemCallLogId(row.coalescedIds().getCoalescedIdList()), + .clearBySystemCallLogId(row.getCoalescedIds().getCoalescedIdList()), new DefaultFutureCallback<>(), MoreExecutors.directExecutor()); } diff --git a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java b/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java index aec4dc6d8..279869d70 100644 --- a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java +++ b/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java @@ -18,12 +18,10 @@ 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. */ @@ -32,16 +30,13 @@ 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(photoInfoBuilder.build()) + .setNumber(row.getNumber()) + .setPhotoInfo( + NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) + .setFormattedNumber(row.getFormattedNumber()) + .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) + .build()) .setPrimaryText(primaryText) .setSecondaryText(CallLogEntryText.buildSecondaryTextForBottomSheet(context, row)) .setIntent(CallLogIntents.getCallBackIntent(context, row)) |