commit 267cdad8f95c541d421292a5675a2e13f81850e0
author yueg <yueg@google.com> Tue May 08 12:09:45 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed May 09 16:56:06 2018 -0700
tree be325d65dff5fcd545832b219f2d0b075bb7edde
parent 4f2b93012de1c9092cd7b3cfc488e794b45cbdd7

Format callback phone number.

Test: manual
PiperOrigin-RevId: 195856176
Change-Id: I8579afff48e9c07d422505b81d703adc03656435

java/com/android/incallui/contactgrid/ContactGridManager.java

diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index d8b1f50..493f2d5 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -23,6 +23,8 @@
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -416,7 +418,9 @@
     // This is used for carriers like Project Fi to show the callback number for emergency calls.
     deviceNumberTextView.setText(
         context.getString(
-            R.string.contact_grid_callback_number, primaryCallState.callbackNumber()));
+            R.string.contact_grid_callback_number,
+            BidiFormatter.getInstance()
+                .unicodeWrap(primaryCallState.callbackNumber(), TextDirectionHeuristics.LTR)));
     deviceNumberTextView.setVisibility(View.VISIBLE);
     if (primaryInfo.shouldShowLocation()) {
       deviceNumberDivider.setVisibility(View.VISIBLE);