From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 31 Aug 2017 06:57:16 -0700 Subject: Update Dialer source to latest internal Google revision. Previously, Android's Dialer app was developed in an internal Google source control system and only exported to public during AOSP drops. The Dialer team is now switching to a public development model similar to the telephony team. This CL represents all internal Google changes that were committed to Dialer between the public O release and today's tip of tree on internal master. This CL squashes those changes into a single commit. In subsequent changes, changes will be exported on a per-commit basis. Test: make, flash install, run Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160 Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8 PiperOrigin-RevId: 167068436 --- .../calldetails/CallDetailsFooterViewHolder.java | 32 ++++++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java') diff --git a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java index 3f894366f..9d3f4bcbc 100644 --- a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java @@ -26,33 +26,41 @@ import com.android.contacts.common.ClipboardUtils; import com.android.dialer.common.Assert; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; +import com.android.dialer.logging.UiAction; +import com.android.dialer.performancereport.PerformanceReport; import com.android.dialer.util.CallUtil; import com.android.dialer.util.DialerUtils; /** ViewHolder container for {@link CallDetailsActivity} footer. */ -public class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder - implements OnClickListener { +final class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder implements OnClickListener { + private final ReportCallIdListener listener; private final View container; private final View copy; private final View edit; + private final View reportCallerId; private String number; - public CallDetailsFooterViewHolder(View view) { + CallDetailsFooterViewHolder(View view, ReportCallIdListener listener) { super(view); + this.listener = listener; container = view.findViewById(R.id.footer_container); copy = view.findViewById(R.id.call_detail_action_copy); edit = view.findViewById(R.id.call_detail_action_edit_before_call); + reportCallerId = view.findViewById(R.id.call_detail_action_report_caller_id); copy.setOnClickListener(this); edit.setOnClickListener(this); + reportCallerId.setOnClickListener(this); } public void setPhoneNumber(String number) { this.number = number; if (TextUtils.isEmpty(number)) { container.setVisibility(View.GONE); + } else if (listener.canReportCallerId(number)) { + reportCallerId.setVisibility(View.VISIBLE); } } @@ -60,14 +68,32 @@ public class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder public void onClick(View view) { Context context = view.getContext(); if (view == copy) { + PerformanceReport.recordClick(UiAction.Type.COPY_NUMBER_IN_CALL_DETAIL); + Logger.get(context).logImpression(DialerImpression.Type.CALL_DETAILS_COPY_NUMBER); ClipboardUtils.copyText(context, null, number, true); } else if (view == edit) { + PerformanceReport.recordClick(UiAction.Type.EDIT_NUMBER_BEFORE_CALL_IN_CALL_DETAIL); + // Dialpad will be filled with this number, but we don't want to record it as user action + PerformanceReport.setIgnoreActionOnce(UiAction.Type.TEXT_CHANGE_WITH_INPUT); + Logger.get(context).logImpression(DialerImpression.Type.CALL_DETAILS_EDIT_BEFORE_CALL); Intent dialIntent = new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(number)); DialerUtils.startActivityWithErrorToast(context, dialIntent); + } else if (view == reportCallerId) { + listener.reportCallId(number); } else { Assert.fail("View on click not implemented: " + view); } } + + /** Listener for reporting caller id */ + interface ReportCallIdListener { + + /** Tell listener that the user requested to report caller id info as inaccurate. */ + void reportCallId(String number); + + /** returns true if the number can be reported as inaccurate. */ + boolean canReportCallerId(String number); + } } -- cgit v1.2.3