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

Commit 23219678 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents a0788b81 7485a6bb
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) {