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

Commit e0a06e21 authored by Minming Qi's avatar Minming Qi Committed by android-build-merger
Browse files

Merge "SystemUI: Customize wifi indicator for China carriers" 

am: 439286d1

Change-Id: I3d4c32e47d232c92209968cd73659bb33ef8f93c
parents 8431eb6c 439286d1

packages/SystemUI/res/values/config.xml

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

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



    <!-- Show indicator for Wifi on but not connected. -->

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



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

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

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

+3 −1
Original line number Diff line number Diff line
@@ -78,8 +78,10 @@ public class WifiSignalController extends 
    @Override

    public void notifyListeners(SignalCallback callback) {

        // only show wifi in the cluster if connected or if wifi-only

        boolean visibleWhenEnabled = mContext.getResources().getBoolean(

                R.bool.config_showWifiIndicatorWhenEnabled);

        boolean wifiVisible = mCurrentState.enabled

                && (mCurrentState.connected || !mHasMobileData);

                && (mCurrentState.connected || !mHasMobileData || visibleWhenEnabled);

        String wifiDesc = wifiVisible ? mCurrentState.ssid : null;

        boolean ssidPresent = wifiVisible && mCurrentState.ssid != null;

        String contentDescription = getStringIfExists(getContentDescription());