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

4 files changed, 32 insertions, 16 deletions

diff --git a/java/com/android/dialer/interactions/PhoneNumberInteraction.java b/java/com/android/dialer/interactions/PhoneNumberInteraction.java
index 52f9d208f..c42be42ec 100644
--- a/java/com/android/dialer/interactions/PhoneNumberInteraction.java
+++ b/java/com/android/dialer/interactions/PhoneNumberInteraction.java
@@ -15,7 +15,6 @@
  */
 package com.android.dialer.interactions;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -28,7 +27,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
 import android.content.Loader.OnLoadCompleteListener;
-import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -42,7 +40,6 @@ import android.provider.ContactsContract.RawContacts;
 import android.support.annotation.IntDef;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -54,16 +51,21 @@ import com.android.contacts.common.Collapser;
 import com.android.contacts.common.Collapser.Collapsible;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.CallIntentParser;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.util.TransactionSafeActivity;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -181,6 +183,7 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
         intent =
             new CallIntentBuilder(phoneNumber, callSpecificAppData)
                 .setIsVideoCall(isVideoCall)
+                .setAllowAssistedDial(callSpecificAppData.getAllowAssistedDialing())
                 .build();
         break;
     }
@@ -218,20 +221,27 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
     // It's possible for a shortcut to have been created, and then permissions revoked. To avoid a
     // crash when the user tries to use such a shortcut, check for this condition and ask the user
     // for the permission.
-    if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.CALL_PHONE)
-        != PackageManager.PERMISSION_GRANTED) {
-      LogUtil.i("PhoneNumberInteraction.startInteraction", "No phone permissions");
+    String[] deniedPhonePermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            mContext, PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+    if (deniedPhonePermissions.length > 0) {
+      LogUtil.i(
+          "PhoneNumberInteraction.startInteraction",
+          "Need phone permissions: " + Arrays.toString(deniedPhonePermissions));
       ActivityCompat.requestPermissions(
-          (Activity) mContext, new String[] {Manifest.permission.CALL_PHONE}, REQUEST_CALL_PHONE);
+          (Activity) mContext, deniedPhonePermissions, REQUEST_CALL_PHONE);
       return;
     }
-    if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.READ_CONTACTS)
-        != PackageManager.PERMISSION_GRANTED) {
-      LogUtil.i("PhoneNumberInteraction.startInteraction", "No contact permissions");
+
+    String[] deniedContactsPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            mContext, PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedContactsPermissions.length > 0) {
+      LogUtil.i(
+          "PhoneNumberInteraction.startInteraction",
+          "Need contact permissions: " + Arrays.toString(deniedContactsPermissions));
       ActivityCompat.requestPermissions(
-          (Activity) mContext,
-          new String[] {Manifest.permission.READ_CONTACTS},
-          REQUEST_READ_CONTACTS);
+          (Activity) mContext, deniedContactsPermissions, REQUEST_READ_CONTACTS);
       return;
     }
 
@@ -543,6 +553,12 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
         final PhoneItem phoneItem = mPhoneList.get(which);
         final CheckBox checkBox = (CheckBox) alertDialog.findViewById(R.id.setPrimary);
         if (checkBox.isChecked()) {
+          if (mCallSpecificAppData.getCallInitiationType() == CallInitiationType.Type.SPEED_DIAL) {
+            Logger.get(getContext())
+                .logInteraction(
+                    InteractionEvent.Type.SPEED_DIAL_SET_DEFAULT_NUMBER_FOR_AMBIGUOUS_CONTACT);
+          }
+
           // Request to mark the data as primary in the background.
           final Intent serviceIntent =
               ContactUpdateService.createSetSuperPrimaryIntent(activity, phoneItem.id);
diff --git a/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml b/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml
index 879ea0e96..879ea0e96 100644..100755
--- a/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml
+++ b/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml
diff --git a/java/com/android/dialer/interactions/res/values-bs/strings.xml b/java/com/android/dialer/interactions/res/values-bs/strings.xml
index d7434f898..24601b51a 100644
--- a/java/com/android/dialer/interactions/res/values-bs/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-bs/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Izaberite broj"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Izaberite broj"</string>
+    <string name="sms_disambig_title" msgid="369677069797534410">"Odaberite broj"</string>
+    <string name="call_disambig_title" msgid="2395382326030227603">"Odaberite broj"</string>
     <string name="make_primary" msgid="9069345357862475091">"Zapamti ovaj izbor"</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-uz/strings.xml b/java/com/android/dialer/interactions/res/values-uz/strings.xml
index 7eb817586..026198cee 100644
--- a/java/com/android/dialer/interactions/res/values-uz/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-uz/strings.xml
@@ -19,5 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sms_disambig_title" msgid="369677069797534410">"Raqamni tanlang"</string>
     <string name="call_disambig_title" msgid="2395382326030227603">"Raqamni tanlang"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Ushbu tanlov eslab qolinsin"</string>
+    <string name="make_primary" msgid="9069345357862475091">"Bu tanlov eslab qolinsin"</string>
 </resources>