Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0573b14 authored by yuichiro fujiwara's avatar yuichiro fujiwara Committed by android-build-merger
Browse files

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

am: 23219678

Change-Id: Ib5faafe9d6acc8cbf65bac7fee2071ee5e1fc11b
parents 1cd5d118 23219678
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.content.DialogInterface;
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 @@ public class ImportDialogFragment extends DialogFragment {

    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 @@ public class ImportDialogFragment extends DialogFragment {
                    phone = sim.getPhone();
                }
                if (phone != null) {
                    phone = PhoneNumberUtilsCompat.createTtsSpannable(phone);
                    phone = sBidiFormatter.unicodeWrap(
                            PhoneNumberUtilsCompat.createTtsSpannable(phone),
                            TextDirectionHeuristicsCompat.LTR);
                }

                if (count != -1 && phone != null) {