1 files changed, 7 insertions, 45 deletions

diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java
index ab003570f..8c3d6b004 100644
--- a/java/com/android/incallui/contactgrid/TopRow.java
+++ b/java/com/android/incallui/contactgrid/TopRow.java
@@ -19,14 +19,10 @@ 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;
 
@@ -59,7 +55,7 @@ public class TopRow {
 
   private TopRow() {}
 
-  public static Info getInfo(Context context, PrimaryCallState state, PrimaryInfo primaryInfo) {
+  public static Info getInfo(Context context, PrimaryCallState state) {
     CharSequence label = null;
     Drawable icon = state.connectionIcon;
     boolean labelIsSingleLine = true;
@@ -77,11 +73,6 @@ 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)) {
@@ -94,8 +85,6 @@ 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
@@ -105,27 +94,9 @@ 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.sessionModificationState, state.isWifi);
+      return getLabelForIncomingVideo(context, state.isWifi);
     } else if (state.isWifi && !TextUtils.isEmpty(state.connectionLabel)) {
       return state.connectionLabel;
     } else if (isAccount(state)) {
@@ -137,20 +108,11 @@ public class TopRow {
     }
   }
 
-  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);
-      }
+  private static CharSequence getLabelForIncomingVideo(Context context, boolean isWifi) {
+    if (isWifi) {
+      return context.getString(R.string.contact_grid_incoming_wifi_video_call);
     } else {
-      if (isWifi) {
-        return context.getString(R.string.contact_grid_incoming_wifi_video_call);
-      } else {
-        return context.getString(R.string.contact_grid_incoming_video_call);
-      }
+      return context.getString(R.string.contact_grid_incoming_video_call);
     }
   }
 
@@ -192,7 +154,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.sessionModificationState, state.isWifi);
+        return getLabelForIncomingVideo(context, state.isWifi);
       case SessionModificationState.NO_REQUEST:
       default:
         Assert.fail();