diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-28 02:25:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-28 02:25:26 +0000 |
commit | 37434b495f1e53612d4279288f6fa3ac5e795615 (patch) | |
tree | f9427ee9449664e50d8974d1fba2bae06a62f08c /java/com/android/dialer/voicemail/listui/menu/Modules.java | |
parent | 9a2265a70b2d2e46391aa37e118f8ae6e5b5dbdf (diff) | |
parent | f80d8afdb0f5ef6d24b8bb76442cab8cef38da8f (diff) |
Merge changes I9ab50a7a,I8a57b632
* changes:
Do not show the voicemail tab if the VM toggle is turned off.
Internal cleanup for the new UI's bottom sheet.
Diffstat (limited to 'java/com/android/dialer/voicemail/listui/menu/Modules.java')
-rw-r--r-- | java/com/android/dialer/voicemail/listui/menu/Modules.java | 67 |
1 files changed, 41 insertions, 26 deletions
diff --git a/java/com/android/dialer/voicemail/listui/menu/Modules.java b/java/com/android/dialer/voicemail/listui/menu/Modules.java index 76ce172b8..9473b80e1 100644 --- a/java/com/android/dialer/voicemail/listui/menu/Modules.java +++ b/java/com/android/dialer/voicemail/listui/menu/Modules.java @@ -17,11 +17,12 @@ package com.android.dialer.voicemail.listui.menu; import android.content.Context; -import com.android.dialer.contactactions.ContactActionModule; -import com.android.dialer.contactactions.DividerModule; -import com.android.dialer.contactactions.SharedModules; +import com.android.dialer.historyitemactions.DividerModule; +import com.android.dialer.historyitemactions.HistoryItemActionModule; +import com.android.dialer.historyitemactions.SharedModules; import com.android.dialer.logging.ReportingLocation; import com.android.dialer.voicemail.model.VoicemailEntry; +import com.google.common.base.Optional; import java.util.ArrayList; import java.util.List; @@ -29,43 +30,57 @@ import java.util.List; * Configures the modules for the voicemail bottom sheet; these are the rows below the top row * (primary action) in the bottom sheet. */ +@SuppressWarnings("Guava") final class Modules { - static List<ContactActionModule> fromVoicemailEntry( + static List<HistoryItemActionModule> fromVoicemailEntry( Context context, VoicemailEntry voicemailEntry) { // Conditionally add each module, which are items in the bottom sheet's menu. - List<ContactActionModule> modules = new ArrayList<>(); + List<HistoryItemActionModule> modules = new ArrayList<>(); // TODO(uabdullah): Handle maybeAddModuleForVideoOrAudioCall(context, modules, row); - SharedModules.maybeAddModuleForAddingToContacts( - context, - modules, - voicemailEntry.number(), - voicemailEntry.numberAttributes().getName(), - voicemailEntry.numberAttributes().getLookupUri(), - voicemailEntry.numberAttributes().getIsBlocked(), - voicemailEntry.numberAttributes().getIsSpam()); + Optional<HistoryItemActionModule> moduleForAddingContacts = + SharedModules.createModuleForAddingToContacts( + context, + voicemailEntry.number(), + voicemailEntry.numberAttributes().getName(), + voicemailEntry.numberAttributes().getLookupUri(), + voicemailEntry.numberAttributes().getIsBlocked(), + voicemailEntry.numberAttributes().getIsSpam()); + if (moduleForAddingContacts.isPresent()) { + modules.add(moduleForAddingContacts.get()); + } - String normalizedNumber = voicemailEntry.number().getNormalizedNumber(); - SharedModules.maybeAddModuleForSendingTextMessage( - context, modules, normalizedNumber, voicemailEntry.numberAttributes().getIsBlocked()); + Optional<HistoryItemActionModule> moduleForSendingTextMessage = + SharedModules.createModuleForSendingTextMessage( + context, + voicemailEntry.number().getNormalizedNumber(), + voicemailEntry.numberAttributes().getIsBlocked()); + if (moduleForSendingTextMessage.isPresent()) { + modules.add(moduleForSendingTextMessage.get()); + } if (!modules.isEmpty()) { modules.add(new DividerModule()); } - SharedModules.addModulesHandlingBlockedOrSpamNumber( - context, - modules, - voicemailEntry.number().getNormalizedNumber(), - voicemailEntry.number().getCountryIso(), - voicemailEntry.callType(), - voicemailEntry.numberAttributes().getIsBlocked(), - voicemailEntry.numberAttributes().getIsSpam(), - ReportingLocation.Type.VOICEMAIL_HISTORY); + modules.addAll( + SharedModules.createModulesHandlingBlockedOrSpamNumber( + context, + voicemailEntry.number().getNormalizedNumber(), + voicemailEntry.number().getCountryIso(), + voicemailEntry.callType(), + voicemailEntry.numberAttributes().getIsBlocked(), + voicemailEntry.numberAttributes().getIsSpam(), + ReportingLocation.Type.VOICEMAIL_HISTORY)); // TODO(zachh): Module for CallComposer. - SharedModules.maybeAddModuleForCopyingNumber(context, modules, normalizedNumber); + Optional<HistoryItemActionModule> moduleForCopyingNumber = + SharedModules.createModuleForCopyingNumber( + context, voicemailEntry.number().getNormalizedNumber()); + if (moduleForCopyingNumber.isPresent()) { + modules.add(moduleForCopyingNumber.get()); + } return modules; } |