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

Commit 88edc649 authored by mqi's avatar mqi Committed by Linux Build Service Account
Browse files

SystemUI: add config for IWLAN 

Add config to control the behaviour of IWLAN.

CRs-Fixed: 1022270
Change-Id: I4c294bf12a500c22532cc24ed1ef486780035a2c
parent 4df4f532

packages/SystemUI/res/values/config.xml

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


    <!-- Whether or not to show battery level text. -->

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



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

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

</resources>

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

+10 −2
Original line number Diff line number Diff line
@@ -305,7 +305,14 @@ public class MobileSignalController extends SignalController< 
                    return false;

                case ServiceState.STATE_OUT_OF_SERVICE:

                case ServiceState.STATE_EMERGENCY_ONLY:

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

                        return mServiceState.getDataRegState() == ServiceState.STATE_IN_SERVICE;

                    } else {

                        return ((mServiceState.getDataRegState() ==

                                      ServiceState.STATE_IN_SERVICE)&&

                                (mServiceState.getDataNetworkType() !=

                                      TelephonyManager.NETWORK_TYPE_IWLAN));

                    }

                default:

                    return true;

            }
@@ -624,7 +631,8 @@ public class MobileSignalController extends SignalController< 
        }



        // Update data net type icons

        if (dataType == TelephonyManager.NETWORK_TYPE_IWLAN) {

        if (dataType == TelephonyManager.NETWORK_TYPE_IWLAN &&

                mContext.getResources().getBoolean(R.bool.config_show4gForIWlan)) {

            // wimax is a special 4g network not handled by telephony

            dataTypeIcon = TelephonyIcons.ICON_4G;

            qsDataTypeIcon = TelephonyIcons.QS_DATA_4G;