diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-02 22:18:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-02 22:18:42 +0000 |
| commit | 07495e23b0bcfe236c62fb2ce45058b7e7f61741 (patch) | |
| tree | 0d0c541ec2274767b0b9b510f51c81364ff0dc68 | |
| parent | 968921de99f42025b00b9b5c8b549c7c0043cf3a (diff) | |
| parent | 79acc546f80e6f729cae45158cc12188af6cebb3 (diff) | |
Merge changes Idbfe48ea,I1ecb83fd
* changes:
Support assisted dialing in CallDetailsActivity when launched from the new call log UI.
Add assisted dialing to the call composer activity.
3 files changed, 6 insertions, 3 deletions
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 0d47c7007..ce3f7f270 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -481,7 +481,10 @@ public class CallComposerActivity extends AppCompatActivity private void placeTelecomCall() { PreCall.start( - this, new CallIntentBuilder(contact.getNumber(), CallInitiationType.Type.CALL_COMPOSER)); + this, + new CallIntentBuilder(contact.getNumber(), CallInitiationType.Type.CALL_COMPOSER) + // Call composer is only active if the number is associated with a known contact. + .setAllowAssistedDial(true)); setResult(RESULT_OK); finish(); } diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index b314e26bf..b15dc456d 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -85,7 +85,7 @@ public class CallDetailsActivity extends AppCompatActivity { public static final String EXTRA_COALESCED_CALL_LOG_IDS = "coalesced_call_log_ids"; public static final String EXTRA_CONTACT = "contact"; public static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id"; - private static final String EXTRA_CAN_SUPPORT_ASSISTED_DIALING = "can_support_assisted_dialing"; + public static final String EXTRA_CAN_SUPPORT_ASSISTED_DIALING = "can_support_assisted_dialing"; private final CallDetailsHeaderViewHolder.CallDetailsHeaderListener callDetailsHeaderListener = new CallDetailsHeaderListener(this); diff --git a/java/com/android/dialer/calllog/ui/menu/Modules.java b/java/com/android/dialer/calllog/ui/menu/Modules.java index d50d8d319..50da2fcaf 100644 --- a/java/com/android/dialer/calllog/ui/menu/Modules.java +++ b/java/com/android/dialer/calllog/ui/menu/Modules.java @@ -99,7 +99,7 @@ final class Modules { // TODO(zachh): Load canReportInaccurateNumber in CallDetailsActivity // (see also isPeopleApiSource(sourceType)). boolean canReportInaccurateNumber = false; - boolean canSupportAssistedDialing = false; // TODO(zachh): Properly set value. + boolean canSupportAssistedDialing = !TextUtils.isEmpty(row.lookupUri()); modules.add( new IntentModule( |