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

Commit a99877b0 authored by Qiang Chen's avatar Qiang Chen
Browse files

Keyguard: Remove converting locale change in CarrierText 

Remove converting locale change to refresh SPN/PLMN string when system
languages change.

CRs-fixed: 648700

Change-Id: I435e281f706a3b37f778d354df6aa841f137c4df
parent f2f63a17

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+1 −23
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import java.util.Locale; 


public class CarrierText extends TextView {

    private static CharSequence mSeparator;

    protected Context mContext;



    private LockPatternUtils mLockPatternUtils;
@@ -93,7 +92,6 @@ public class CarrierText extends TextView { 


    public CarrierText(Context context, AttributeSet attrs) {

        super(context, attrs);

        mContext = context;

        mLockPatternUtils = new LockPatternUtils(mContext);

        boolean useAllCaps = mContext.getResources().getBoolean(R.bool.kg_use_all_caps);

        setTransformationMethod(new CarrierTextTransformationMethod(mContext, useAllCaps));
@@ -149,30 +147,10 @@ public class CarrierText extends TextView { 
            CharSequence plmn, CharSequence spn) {

        CharSequence carrierText = null;

        StatusMode status = getStatusForIccState(simState);

        String localPlmn = null;

        String localSpn = null;

        if (mContext.getResources().getBoolean(R.bool.config_monitor_locale_change)) {

            if (plmn != null) {

                localPlmn = android.util.NativeTextHelper.getInternalLocalString(mContext,

                    plmn.toString(),

                    R.array.origin_carrier_names,

                    R.array.locale_carrier_names);

            }

            if (spn != null) {

                localSpn = android.util.NativeTextHelper.getInternalLocalString(mContext,

                    spn.toString(),

                    R.array.origin_carrier_names,

                    R.array.locale_carrier_names);

            }

        }



        switch (status) {

            case Normal:

                if (mContext.getResources().getBoolean(R.bool.config_monitor_locale_change)) {

                    carrierText = concatenate(localPlmn, localSpn);

                } else {

                carrierText = concatenate(plmn, spn);

                }

                break;



            case SimNotReady: