commit 29e73e26b0654b0f9322bb0d464d0531b6c5d57c
author mariagpuyol <mariagpuyol@google.com> Sat May 14 14:29:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 14 14:29:55 2016 +0000
tree ed691c659c6ad03abe5da49f1cdb244dfc25f3a1
parent a95d26400ead88039aff6286b118a89a7874613c
parent 22cc0678b6240ddf13deb6adb7ca73fc9cd1dbef

Merge "Force phone number to be LTR" into nyc-dev
am: 22cc0678b6

* commit '22cc0678b6240ddf13deb6adb7ca73fc9cd1dbef':
  Force phone number to be LTR

Change-Id: I035a605f1d338407b31f2f76fb72f49d364ad1ec

src/com/android/emergency/preferences/ContactPreference.java

diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index 37c1066..d4549eb 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -27,6 +27,8 @@
 import android.preference.Preference;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.view.View;
 
 import com.android.emergency.EmergencyContactManager;
@@ -85,7 +87,8 @@
                 String.format(
                         getContext().getResources().getString(R.string.phone_type_and_phone_number),
                         mContact.getPhoneType(),
-                        mContact.getPhoneNumber());
+                        BidiFormatter.getInstance().unicodeWrap(mContact.getPhoneNumber(),
+                                TextDirectionHeuristics.LTR));
         setSummary(summary);
 
         // Update the message to show the correct name.