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.
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index 0d47c70..ce3f7f2 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -481,7 +481,10 @@
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 b314e26..b15dc45 100644
--- a/java/com/android/dialer/calldetails/CallDetailsActivity.java
+++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java
@@ -85,7 +85,7 @@
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 d50d8d3..50da2fc 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 @@
// 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(