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

Commit 4d8f5153 authored by Wu Qiang's avatar Wu Qiang Committed by Fan Zhang
Browse files

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
parent 66898b0c

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

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.support.v7.preference.PreferenceScreen; 
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 @@ public class PhoneNumberPreferenceController extends AbstractPreferenceControlle 
        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

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ import android.telephony.SignalStrength; 
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 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 


    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) {