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

Commit 42900a85 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

systemui: networkcontroller update default networks resources 



Default network resources are locale dependent and should be update to reflect the
current user locale, if the locale changed.

Change-Id: I4688cc7132e0c0707ee30dd67ce025099655cded
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent c40ba1db

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+8 −3
Original line number Diff line number Diff line
@@ -230,9 +230,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
        registerPhoneStateListener(context);

        mHspaDataDistinguishable = mContext.getResources().getBoolean(

                R.bool.config_hspa_data_distinguishable);

        mNetworkNameSeparator = mContext.getString(R.string.status_bar_network_name_separator);

        mNetworkNameDefault = mContext.getString(

                com.android.internal.R.string.lockscreen_carrier_default);

        updateDefaultNetworkResources();

        mNetworkName = mNetworkNameDefault;



        // wifi
@@ -462,6 +460,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
            updateDataIcon();

            refreshViews();

        } else if (action.equals(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION)) {

            updateDefaultNetworkResources();

            updateNetworkName(intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_SPN, false),

                        intent.getStringExtra(TelephonyIntents.EXTRA_SPN),

                        intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_PLMN, false),
@@ -925,6 +924,12 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
        mDataConnected = visible;

    }



    private void updateDefaultNetworkResources() {

        mNetworkNameSeparator = mContext.getString(R.string.status_bar_network_name_separator);

        mNetworkNameDefault = mContext.getString(

                com.android.internal.R.string.lockscreen_carrier_default);

    }



    void updateNetworkName(boolean showSpn, String spn, boolean showPlmn, String plmn) {

        if (false) {

            Log.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn