Snap for 4502278 from 5583dec5402c7e89549e6776bb2628a613453c23 to pi-release (0a9d8f3c) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/app/DialtactsActivity.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ import com.android.dialer.database.DialerDatabaseHelper;
		import com.android.dialer.dialpadview.DialpadFragment;
		import com.android.dialer.dialpadview.DialpadFragment.DialpadListener;
		import com.android.dialer.dialpadview.DialpadFragment.LastOutgoingCallCallback;
		import com.android.dialer.duo.DuoComponent;
		import com.android.dialer.interactions.PhoneNumberInteraction;
		import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode;
		import com.android.dialer.logging.DialerImpression;
		@@ -836,6 +837,10 @@ public class DialtactsActivity extends TransactionSafeActivity
		.setActionTextColor(getResources().getColor(R.color.dialer_snackbar_action_text_color))
		.show();
		}
		} else if (requestCode == ActivityRequestCodes.DIALTACTS_DUO) {
		// We just returned from starting Duo for a task. Reload our reachability data since it
		// may have changed after a user finished activating Duo.
		DuoComponent.get(this).getDuo().reloadReachability(this);
		}
		super.onActivityResult(requestCode, resultCode, data);
		}

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -683,7 +683,11 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number));
		inviteVideoButtonView.setVisibility(View.VISIBLE);
		} else if (duo.isEnabled(mContext)) {
		if (!duo.isInstalled(mContext)) {
		setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider());
		} else {
		setUpVideoButtonView.setTag(IntentProvider.getSetUpDuoIntentProvider());
		}
		setUpVideoButtonView.setVisibility(View.VISIBLE);
		}
		break;

java/com/android/dialer/app/calllog/IntentProvider.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,26 @@ public abstract class IntentProvider {
		};
		}

		public static IntentProvider getInstallDuoIntentProvider() {
		return new IntentProvider() {
		@Override
		public Intent getIntent(Context context) {
		return new Intent(
		Intent.ACTION_VIEW,
		new Uri.Builder()
		.scheme("https")
		.authority("play.google.com")
		.appendEncodedPath("store/apps/details")
		.appendQueryParameter("id", "com.google.android.apps.tachyon")
		.appendQueryParameter(
		"referrer",
		"utm_source=dialer&utm_medium=text&utm_campaign=product") // This string is from
		// the Duo team
		.build());
		}
		};
		}

		public static IntentProvider getSetUpDuoIntentProvider() {
		return new IntentProvider() {
		@Override

java/com/android/dialer/calldetails/CallDetailsActivity.java

+98 −9

Original line number	Diff line number	Diff line
		@@ -19,9 +19,12 @@ package com.android.dialer.calldetails;
		import android.Manifest.permission;
		import android.annotation.SuppressLint;
		import android.app.Activity;
		import android.app.LoaderManager.LoaderCallbacks;
		import android.content.ActivityNotFoundException;
		import android.content.Context;
		import android.content.Intent;
		import android.content.Loader;
		import android.database.Cursor;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.provider.CallLog;
		@@ -35,11 +38,13 @@ import android.support.v7.widget.RecyclerView;
		import android.support.v7.widget.Toolbar;
		import android.view.View;
		import android.widget.Toast;
		import com.android.dialer.CoalescedIds;
		import com.android.dialer.DialerPhoneNumber;
		import com.android.dialer.assisteddialing.ui.AssistedDialingSettingActivity;
		import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
		import com.android.dialer.callintent.CallInitiationType;
		import com.android.dialer.callintent.CallIntentBuilder;
		import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
		import com.android.dialer.common.Assert;
		import com.android.dialer.common.LogUtil;
		import com.android.dialer.common.concurrent.AsyncTaskExecutors;
		@@ -62,6 +67,7 @@ import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
		import com.android.dialer.postcall.PostCall;
		import com.android.dialer.precall.PreCall;
		import com.android.dialer.protos.ProtoParsers;
		import com.google.common.base.Optional;
		import com.google.common.base.Preconditions;
		import com.google.i18n.phonenumbers.PhoneNumberUtil;
		import java.lang.ref.WeakReference;
		@@ -71,10 +77,12 @@ import java.util.Map;

		/** Displays the details of a specific call log entry. */
		public class CallDetailsActivity extends AppCompatActivity {
		private static final int CALL_DETAILS_LOADER_ID = 0;

		public static final String EXTRA_PHONE_NUMBER = "phone_number";
		public static final String EXTRA_HAS_ENRICHED_CALL_DATA = "has_enriched_call_data";
		public static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries";
		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";
		@@ -93,23 +101,47 @@ public class CallDetailsActivity extends AppCompatActivity {
		private DialerContact contact;
		private CallDetailsAdapter adapter;

		// This will be present only when the activity is launched from the new call log UI, i.e., a list
		// of coalesced annotated call log IDs is included in the intent.
		private Optional<CoalescedIds> coalescedCallLogIds = Optional.absent();

		public static boolean isLaunchIntent(Intent intent) {
		return intent.getComponent() != null
		&& CallDetailsActivity.class.getName().equals(intent.getComponent().getClassName());
		}

		/**
		* Returns an {@link Intent} for launching the {@link CallDetailsActivity} from the old call log
		* UI.
		*/
		public static Intent newInstance(
		Context context,
		@NonNull CallDetailsEntries details,
		@NonNull DialerContact contact,
		CallDetailsEntries details,
		DialerContact contact,
		boolean canReportCallerId,
		boolean canSupportAssistedDialing) {
		Assert.isNotNull(details);
		Assert.isNotNull(contact);
		Intent intent = new Intent(context, CallDetailsActivity.class);
		ProtoParsers.put(intent, EXTRA_CONTACT, Assert.isNotNull(contact));
		ProtoParsers.put(intent, EXTRA_CALL_DETAILS_ENTRIES, Assert.isNotNull(details));
		intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
		intent.putExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, canSupportAssistedDialing);
		return intent;
		}

		/**
		* Returns an {@link Intent} for launching the {@link CallDetailsActivity} from the new call log
		* UI.
		*/
		public static Intent newInstance(
		Context context,
		CoalescedIds coalescedAnnotatedCallLogIds,
		DialerContact contact,
		boolean canReportCallerId,
		boolean canSupportAssistedDialing) {
		Intent intent = new Intent(context, CallDetailsActivity.class);
		ProtoParsers.put(intent, EXTRA_CONTACT, contact);
		ProtoParsers.put(intent, EXTRA_CALL_DETAILS_ENTRIES, details);
		ProtoParsers.put(intent, EXTRA_CONTACT, Assert.isNotNull(contact));
		ProtoParsers.put(
		intent, EXTRA_COALESCED_CALL_LOG_IDS, Assert.isNotNull(coalescedAnnotatedCallLogIds));
		intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
		intent.putExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, canSupportAssistedDialing);
		return intent;
		@@ -166,10 +198,30 @@ public class CallDetailsActivity extends AppCompatActivity {
		}

		private void onHandleIntent(Intent intent) {
		boolean hasCallDetailsEntries = intent.hasExtra(EXTRA_CALL_DETAILS_ENTRIES);
		boolean hasCoalescedCallLogIds = intent.hasExtra(EXTRA_COALESCED_CALL_LOG_IDS);
		Assert.checkArgument(
		(hasCallDetailsEntries && !hasCoalescedCallLogIds)
		\|\| (!hasCallDetailsEntries && hasCoalescedCallLogIds),
		"One and only one of EXTRA_CALL_DETAILS_ENTRIES and EXTRA_COALESCED_CALL_LOG_IDS "
		+ "can be included in the intent.");

		contact = ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance());
		if (hasCallDetailsEntries) {
		entries =
		ProtoParsers.getTrusted(
		intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance());
		} else {
		entries = CallDetailsEntries.getDefaultInstance();
		coalescedCallLogIds =
		Optional.of(
		ProtoParsers.getTrusted(
		intent, EXTRA_COALESCED_CALL_LOG_IDS, CoalescedIds.getDefaultInstance()));
		getLoaderManager()
		.initLoader(
		CALL_DETAILS_LOADER_ID, /* args = */ null, new CallDetailsLoaderCallbacks(this));
		}

		adapter =
		new CallDetailsAdapter(
		this /* context */,
		@@ -191,6 +243,43 @@ public class CallDetailsActivity extends AppCompatActivity {
		super.onBackPressed();
		}

		/**
		* {@link LoaderCallbacks} for {@link CallDetailsCursorLoader}, which loads call detail entries
		* from {@link AnnotatedCallLog}.
		*/
		private static final class CallDetailsLoaderCallbacks implements LoaderCallbacks<Cursor> {
		private final CallDetailsActivity activity;

		CallDetailsLoaderCallbacks(CallDetailsActivity callDetailsActivity) {
		this.activity = callDetailsActivity;
		}

		@Override
		public Loader<Cursor> onCreateLoader(int id, Bundle args) {
		Assert.checkState(activity.coalescedCallLogIds.isPresent());

		return new CallDetailsCursorLoader(activity, activity.coalescedCallLogIds.get());
		}

		@Override
		public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
		updateCallDetailsEntries(CallDetailsCursorLoader.toCallDetailsEntries(data));
		}

		@Override
		public void onLoaderReset(Loader<Cursor> loader) {
		updateCallDetailsEntries(CallDetailsEntries.getDefaultInstance());
		}

		private void updateCallDetailsEntries(CallDetailsEntries newEntries) {
		activity.entries = newEntries;
		activity.adapter.updateCallDetailsEntries(newEntries.getEntriesList());
		EnrichedCallComponent.get(activity)
		.getEnrichedCallManager()
		.requestAllHistoricalData(activity.contact.getNumber(), newEntries);
		}
		}

		/** Delete specified calls from the call log. */
		private static class DeleteCallsTask extends AsyncTask<Void, Void, Void> {
		// Use a weak reference to hold the Activity so that there is no memory leak.

java/com/android/dialer/calldetails/CallDetailsAdapter.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,9 @@ final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol

		@Override
		public int getItemCount() {
		return callDetailsEntries.size() + 2; // Header + footer
		return callDetailsEntries.isEmpty()
		? 0
		: callDetailsEntries.size() + 2; // plus header and footer
		}

		void updateCallDetailsEntries(List<CallDetailsEntry> entries) {