diff options
Diffstat (limited to 'java/com/android/dialer/calldetails')
3 files changed, 23 insertions, 2 deletions
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index 70cb61adc..411006c46 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -45,12 +45,20 @@ import java.util.List; public class CallDetailsActivity extends AppCompatActivity implements OnMenuItemClickListener, CallDetailsFooterViewHolder.ReportCallIdListener { + public static final String EXTRA_PHONE_NUMBER = "phone_number"; + public static final String EXTRA_HAS_ENRICHED_CALL_DATA = "has_enriched_call_data"; private static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries"; private static final String EXTRA_CONTACT = "contact"; private static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id"; private static final String TASK_DELETE = "task_delete"; private List<CallDetailsEntry> entries; + private DialerContact contact; + + public static boolean isLaunchIntent(Intent intent) { + return intent.getComponent() != null + && CallDetailsActivity.class.getName().equals(intent.getComponent().getClassName()); + } public static Intent newInstance( Context context, @@ -104,8 +112,7 @@ public class CallDetailsActivity extends AppCompatActivity } private void onHandleIntent(Intent intent) { - DialerContact contact = - ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance()); + contact = ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance()); entries = ProtoParsers.getTrusted( intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance()) @@ -169,6 +176,15 @@ public class CallDetailsActivity extends AppCompatActivity @Override public void onPostExecute(Void result) { + Intent data = new Intent(); + data.putExtra(EXTRA_PHONE_NUMBER, contact.getNumber()); + for (CallDetailsEntry entry : entries) { + if (entry.getHistoryResultsCount() > 0) { + data.putExtra(EXTRA_HAS_ENRICHED_CALL_DATA, true); + break; + } + } + setResult(RESULT_OK, data); finish(); } } diff --git a/java/com/android/dialer/calldetails/ReportDialogFragment.java b/java/com/android/dialer/calldetails/ReportDialogFragment.java index c27bd611b..0861c9dbb 100644 --- a/java/com/android/dialer/calldetails/ReportDialogFragment.java +++ b/java/com/android/dialer/calldetails/ReportDialogFragment.java @@ -32,6 +32,8 @@ import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener; import com.android.dialer.common.concurrent.DialerExecutor.Worker; import com.android.dialer.common.concurrent.DialerExecutorComponent; +import com.android.dialer.logging.DialerImpression; +import com.android.dialer.logging.Logger; import com.android.dialer.phonenumbercache.CachedNumberLookupService; import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo; import com.android.dialer.phonenumbercache.PhoneNumberCache; @@ -144,8 +146,10 @@ public class ReportDialogFragment extends DialogFragment { Context context = output.first; boolean wasReport = output.second; if (wasReport) { + Logger.get(context).logImpression(DialerImpression.Type.CALLER_ID_REPORTED); Toast.makeText(context, R.string.report_caller_id_toast, Toast.LENGTH_SHORT).show(); } else { + Logger.get(context).logImpression(DialerImpression.Type.CALLER_ID_REPORT_FAILED); Toast.makeText(context, R.string.report_caller_id_failed, Toast.LENGTH_SHORT).show(); } } diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto index e254b7713..18bc931cb 100644 --- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto +++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.calldetails"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + import "java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto"; package com.android.dialer.calldetails; |