commit a0573b14e5dceee0303697c84dad0ab9e7834b37
author yuichiro fujiwara <yuichiro.fujiwara@sony.com> Tue Oct 17 20:44:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 17 20:44:37 2017 +0000
tree 5dc92f1cbc9f633535ee7ae6e60defd5984cd795
parent 1cd5d11852653f716792a7d3fe8133971d92f512
parent 2321967884d9bb21b17dc6ea7fb3f368de0a40ce

Merge "Fixed that wrong SIM phone number is displayed when setting RTL language"
am: 2321967884

Change-Id: Ib5faafe9d6acc8cbf65bac7fee2071ee5e1fc11b

src/com/android/contacts/interactions/ImportDialogFragment.java

diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index 367ae2f..5d27086 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -26,6 +26,8 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.support.v4.text.BidiFormatter;
+import android.support.v4.text.TextDirectionHeuristicsCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -69,6 +71,8 @@
 
     private Future<List<AccountInfo>> mAccountsFuture;
 
+    private static BidiFormatter sBidiFormatter = BidiFormatter.getInstance();
+
     /** Preferred way to show this dialog */
     public static void show(FragmentManager fragmentManager) {
         final ImportDialogFragment fragment = new ImportDialogFragment();
@@ -160,7 +164,9 @@
                     phone = sim.getPhone();
                 }
                 if (phone != null) {
-                    phone = PhoneNumberUtilsCompat.createTtsSpannable(phone);
+                    phone = sBidiFormatter.unicodeWrap(
+                            PhoneNumberUtilsCompat.createTtsSpannable(phone),
+                            TextDirectionHeuristicsCompat.LTR);
                 }
 
                 if (count != -1 && phone != null) {