commit 4d8f51531f7f01e2d08898906a393cb606b86353
author Wu Qiang <qiang.x.wu@sony.com> Fri Jul 07 18:18:16 2017 +0800
committer Fan Zhang <zhfan@google.com> Tue Jan 16 09:58:36 2018 -0800
tree 05f6da05ff8ff91a326843b3d9efa60f2d10f88c
parent 66898b0cc9cf52249271a54b38a04b1725884478

Fix plus position in about phone

Settings has phone number in about phone, "+"
is shown with incorrect position in Bidi layout.
Then it needs to use BidiFormatter

Fixes: 70700094
Test: manual
Change-Id: I1d63f773926136c38ce1ac811869476dc6a89eac

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index 802d774..93f75bf 100644
--- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -23,6 +23,8 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 
 import com.android.settings.R;
@@ -120,7 +122,7 @@
         final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
                 subscriptionInfo);
         return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
-                : phoneNumber;
+                : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);
     }
 
     @VisibleForTesting

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 35b8bd1..91440f7 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -39,6 +39,8 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -195,7 +197,8 @@
 
     private void updatePhoneNumber() {
         // If formattedNumber is null or empty, it'll display as "Unknown".
-        mDialog.setText(PHONE_NUMBER_VALUE_ID, getPhoneNumber());
+        mDialog.setText(PHONE_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(
+                getPhoneNumber(), TextDirectionHeuristics.LTR));
     }
 
     private void updateDataState(int state) {