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

Commit 37d34ba8 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Add support to hide LTE+ in UI. 

Some carriers may not want LTE_CA to show in status bar/QS
so added a config overlay setting for this.

bug:30394970
Change-Id: I6e318aa9bd5921f76ded477415269f2996e5534c
parent 9adea2e2

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,9 @@ 
    <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->

    <bool name="config_show4GForLTE">true</bool>



    <!-- Should "LTE"/"4G" be shown instead of "LTE+"/"4G+" when on NETWORK_TYPE_LTE_CA? -->

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



    <!-- milliseconds before the heads up notification auto-dismisses. -->

    <integer name="heads_up_notification_decay">5000</integer>

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

+14 −3
Original line number Diff line number Diff line
@@ -197,11 +197,22 @@ public class MobileSignalController extends SignalController< 


        if (mConfig.show4gForLte) {

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.FOUR_G);

            if (mConfig.hideLtePlus) {

                mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,

                        TelephonyIcons.FOUR_G);

            } else {

                mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,

                        TelephonyIcons.FOUR_G_PLUS);

            }

        } else {

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.LTE);

            mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA, TelephonyIcons.LTE_PLUS);

            if (mConfig.hideLtePlus) {

                mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,

                        TelephonyIcons.LTE);

            } else {

                mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE_CA,

                        TelephonyIcons.LTE_PLUS);

            }

        }

        mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.WFC);

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        boolean showAtLeast3G = false;

        boolean alwaysShowCdmaRssi = false;

        boolean show4gForLte = false;

        boolean hideLtePlus = false;

        boolean hspaDataDistinguishable;



        static Config readConfig(Context context) {
@@ -864,6 +865,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            config.show4gForLte = res.getBoolean(R.bool.config_show4GForLTE);

            config.hspaDataDistinguishable =

                    res.getBoolean(R.bool.config_hspa_data_distinguishable);

            config.hideLtePlus = res.getBoolean(R.bool.config_hideLtePlus);

            return config;

        }

    }