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

Commit f6df92c7 authored by Zhao Wei Liew's avatar Zhao Wei Liew Committed by Steve Kondik
Browse files

Revert "Support to show long or short name in SystemUI." 

This config option introduced by CAF seems pretty pointless.
Revert the original CAF commit to reduce deviation from AOSP.

This essentially reverts commit 9bb392c0.

Change-Id: I8439467f26ae1d612146f1213dfa90e8c0fecc7e
parent bc8954ac

packages/SystemUI/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -304,8 +304,5 @@ 


    <bool name="config_show4gForIWlan">false</bool>

    <bool name="config_showSignalForIWlan">false</bool>



    <bool name="config_show_long_operator_name">false</bool>

    <bool name="config_show_long_operator_name_when_roaming">false</bool>

</resources>

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

+0 −15
Original line number Diff line number Diff line
@@ -625,12 +625,6 @@ public class MobileSignalController extends SignalController< 
            mCurrentState.networkName = mServiceState.getOperatorAlphaShort();

        }



        if (!showLongOperatorName() && mServiceState != null) {

            mCurrentState.networkNameData = TextUtils.isEmpty(mServiceState.

                    getOperatorAlphaShort()) ? mCurrentState.networkNameData : mServiceState.

                    getOperatorAlphaShort() + " " + getNetworkClassString(mServiceState);

        }



        if (mConfig.readIconsFromXml) {

            mCurrentState.voiceLevel = getVoiceSignalLevel();

        }
@@ -646,15 +640,6 @@ public class MobileSignalController extends SignalController< 
        return !mPhone.getDataEnabled(mSubscriptionInfo.getSubscriptionId());

    }



    private boolean showLongOperatorName() {

        if (mContext.getResources().getBoolean(R.bool.config_show_long_operator_name) || (mContext.

                getResources().getBoolean(R.bool.config_show_long_operator_name_when_roaming) &&

                isRoaming())) {

            return true;

        }

        return false;

    }



    private void generateIconGroup() {

        final int level = mCurrentState.level;

        final int voiceLevel = mCurrentState.voiceLevel;