Update AOSP Dialer source from internal google3 repository at

cl/158012278.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/152373142 (4/06/2017) to cl/158012278 (6/05/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I4d3f14b5140e2e51bead9497bc118a205b3ebe76

1 files changed, 45 insertions, 7 deletions

diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java
index 8c3d6b004..ab003570f 100644
--- a/java/com/android/incallui/contactgrid/TopRow.java
+++ b/java/com/android/incallui/contactgrid/TopRow.java
@@ -19,10 +19,14 @@ package com.android.incallui.contactgrid;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
+import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
 import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.incall.protocol.PrimaryCallState;
+import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.videotech.utils.SessionModificationState;
 import com.android.incallui.videotech.utils.VideoUtils;
 
@@ -55,7 +59,7 @@ public class TopRow {
 
   private TopRow() {}
 
-  public static Info getInfo(Context context, PrimaryCallState state) {
+  public static Info getInfo(Context context, PrimaryCallState state, PrimaryInfo primaryInfo) {
     CharSequence label = null;
     Drawable icon = state.connectionIcon;
     boolean labelIsSingleLine = true;
@@ -73,6 +77,11 @@ public class TopRow {
         labelIsSingleLine = false;
       } else {
         label = getLabelForIncoming(context, state);
+        // Show phone number if it's not displayed in name (center row) or location field (bottom
+        // row).
+        if (shouldShowNumber(primaryInfo)) {
+          label = TextUtils.concat(label, " ", spanDisplayNumber(primaryInfo.number));
+        }
       }
     } else if (VideoUtils.hasSentVideoUpgradeRequest(state.sessionModificationState)
         || VideoUtils.hasReceivedVideoUpgradeRequest(state.sessionModificationState)) {
@@ -85,6 +94,8 @@ public class TopRow {
       label = getLabelForDialing(context, state);
     } else if (state.state == State.ACTIVE && state.isRemotelyHeld) {
       label = context.getString(R.string.incall_remotely_held);
+    } else if (state.state == State.ACTIVE && shouldShowNumber(primaryInfo)) {
+      label = spanDisplayNumber(primaryInfo.number);
     } else {
       // Video calling...
       // [Wi-Fi icon] Starbucks Wi-Fi
@@ -94,9 +105,27 @@ public class TopRow {
     return new Info(label, icon, labelIsSingleLine);
   }
 
+  private static CharSequence spanDisplayNumber(String displayNumber) {
+    return PhoneNumberUtils.createTtsSpannable(
+        BidiFormatter.getInstance().unicodeWrap(displayNumber, TextDirectionHeuristics.LTR));
+  }
+
+  private static boolean shouldShowNumber(PrimaryInfo primaryInfo) {
+    if (primaryInfo.nameIsNumber) {
+      return false;
+    }
+    if (primaryInfo.location == null) {
+      return false;
+    }
+    if (TextUtils.isEmpty(primaryInfo.number)) {
+      return false;
+    }
+    return true;
+  }
+
   private static CharSequence getLabelForIncoming(Context context, PrimaryCallState state) {
     if (state.isVideoCall) {
-      return getLabelForIncomingVideo(context, state.isWifi);
+      return getLabelForIncomingVideo(context, state.sessionModificationState, state.isWifi);
     } else if (state.isWifi && !TextUtils.isEmpty(state.connectionLabel)) {
       return state.connectionLabel;
     } else if (isAccount(state)) {
@@ -108,11 +137,20 @@ public class TopRow {
     }
   }
 
-  private static CharSequence getLabelForIncomingVideo(Context context, boolean isWifi) {
-    if (isWifi) {
-      return context.getString(R.string.contact_grid_incoming_wifi_video_call);
+  private static CharSequence getLabelForIncomingVideo(
+      Context context, @SessionModificationState int sessionModificationState, boolean isWifi) {
+    if (sessionModificationState == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
+      if (isWifi) {
+        return context.getString(R.string.contact_grid_incoming_wifi_video_request);
+      } else {
+        return context.getString(R.string.contact_grid_incoming_video_request);
+      }
     } else {
-      return context.getString(R.string.contact_grid_incoming_video_call);
+      if (isWifi) {
+        return context.getString(R.string.contact_grid_incoming_wifi_video_call);
+      } else {
+        return context.getString(R.string.contact_grid_incoming_video_call);
+      }
     }
   }
 
@@ -154,7 +192,7 @@ public class TopRow {
       case SessionModificationState.UPGRADE_TO_VIDEO_REQUEST_TIMED_OUT:
         return context.getString(R.string.incall_video_call_request_timed_out);
       case SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST:
-        return getLabelForIncomingVideo(context, state.isWifi);
+        return getLabelForIncomingVideo(context, state.sessionModificationState, state.isWifi);
       case SessionModificationState.NO_REQUEST:
       default:
         Assert.fail();