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

Commit 2d11cf64 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan Committed by Gerrit Code Review
Browse files

SystemUI: various fixes to data type display 

- Hide data type when Wi-Fi is in use (CAF bug)
- Display "!" when data is disabled (CAF bug)
- Display type in QS when Wi-Fi is connected to captive portal (AOSP bug)

CAF bug was introduced in 228bccb9

The proper logic is described at https://android.googlesource.com/platform/frameworks/base/+/23dd176

Change-Id: I7a34077d604c66c357809c634fe64c570a16e260
parent a000cdc3

packages/SystemUI/res/values/arrays.xml

+90 −90
Original line number Diff line number Diff line
@@ -475,11 +475,11 @@ 
    </string-array>



    <string-array name="signal_strength_g_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_g_fully_sim1">
@@ -491,11 +491,11 @@ 
    </string-array>



     <string-array name="signal_strength_g_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_g_fully_roaming_sim1">
@@ -507,11 +507,11 @@ 
    </string-array>



    <string-array name="signal_strength_e_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_e_fully_sim1">
@@ -523,11 +523,11 @@ 
    </string-array>



     <string-array name="signal_strength_e_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_e_fully_roaming_sim1">
@@ -539,11 +539,11 @@ 
    </string-array>



    <string-array name="signal_strength_3g_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_3g_fully_sim1">
@@ -555,11 +555,11 @@ 
    </string-array>



     <string-array name="signal_strength_3g_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_3g_fully_roaming_sim1">
@@ -571,11 +571,11 @@ 
    </string-array>



    <string-array name="signal_strength_4g_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_4g_fully_sim1">
@@ -587,11 +587,11 @@ 
    </string-array>



     <string-array name="signal_strength_4g_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_4g_fully_roaming_sim1">
@@ -603,11 +603,11 @@ 
    </string-array>



    <string-array name="signal_strength_h_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_h_fully_sim1">
@@ -619,11 +619,11 @@ 
    </string-array>



     <string-array name="signal_strength_h_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_h_fully_roaming_sim1">
@@ -635,11 +635,11 @@ 
    </string-array>



    <string-array name="signal_strength_hp_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_hp_fully_sim1">
@@ -651,11 +651,11 @@ 
    </string-array>



     <string-array name="signal_strength_hp_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_hp_fully_roaming_sim1">
@@ -667,11 +667,11 @@ 
    </string-array>



    <string-array name="signal_strength_1x_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_1x_fully_sim1">
@@ -683,11 +683,11 @@ 
    </string-array>



     <string-array name="signal_strength_1x_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_1x_fully_roaming_sim1">
@@ -699,11 +699,11 @@ 
    </string-array>



    <string-array name="signal_strength_cdma_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_cdma_fully_sim1">
@@ -715,11 +715,11 @@ 
    </string-array>



     <string-array name="signal_strength_cdma_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_cdma_fully_roaming_sim1">
@@ -731,11 +731,11 @@ 
    </string-array>



    <string-array name="signal_strength_umts_normal_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_umts_fully_sim1">
@@ -747,11 +747,11 @@ 
    </string-array>



     <string-array name="signal_strength_umts_normal_roaming_sim1">

        <item>drawable/stat_sys_signal_0_fully</item>

        <item>drawable/stat_sys_signal_1_fully</item>

        <item>drawable/stat_sys_signal_2_fully</item>

        <item>drawable/stat_sys_signal_3_fully</item>

        <item>drawable/stat_sys_signal_4_fully</item>

        <item>drawable/stat_sys_signal_0</item>

        <item>drawable/stat_sys_signal_1</item>

        <item>drawable/stat_sys_signal_2</item>

        <item>drawable/stat_sys_signal_3</item>

        <item>drawable/stat_sys_signal_4</item>

    </string-array>



    <string-array name="signal_strength_umts_fully_roaming_sim1">

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { 
                : R.drawable.ic_qs_signal_no_signal;

        state.isOverlayIconWide = cb.isDataTypeIconWide;

        state.autoMirrorDrawable = !cb.noSim;

        state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) && !cb.wifiConnected

        state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0)

                ? cb.dataTypeIconId

                : 0;

        state.filter = state.iconId != R.drawable.ic_qs_no_sim;

packages/SystemUI/src/com/android/systemui/statusbar/MSimSignalClusterView.java

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ public class MSimSignalClusterView 


        if (mStyle == STATUS_BAR_STYLE_ANDROID_DEFAULT) {

            mMobileType[phoneId].setVisibility(

                    !mWifiVisible ? View.VISIBLE : View.GONE);

                    (mMobileTypeId[phoneId] != 0) ? View.VISIBLE : View.GONE);

        } else {

            mMobileType[phoneId].setVisibility(View.GONE);

        }

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

+5 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
                    mPlmn[phoneId], phoneId);

            updateCarrierText(phoneId);

            refreshViews(phoneId);

        } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION) ||

        } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE) ||

                 action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {

            updateConnectivity(intent);

            refreshViews(mDefaultPhoneId);
@@ -426,6 +426,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
                registerPhoneStateListener(mContext);

                mDefaultPhoneId = getDefaultPhoneId();

                for (int i=0 ; i < mPhoneCount ; i++) {

                    updateIconSet(i);

                    updateCarrierText(i);

                    updateTelephonySignalStrength(i);

                    updateDataNetType(i);
@@ -870,8 +871,9 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
            + " hspapDistinguishable=" + "false"

            + " showAtLeastThreeGees=" + String.valueOf(mShowAtLeastThreeGees));



        int inetCondition = inetConditionForNetwork(ConnectivityManager.TYPE_MOBILE);

        TelephonyIcons.updateDataType(phoneId, chosenNetworkType, mShowAtLeastThreeGees,

            mShow4GforLTE, mHspaDataDistinguishable, mInetCondition);

            mShow4GforLTE, mHspaDataDistinguishable, inetCondition);

    }



    private final void updateDataIcon(int phoneId) {
@@ -1015,6 +1017,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        // We want to update all the icons, all at once, for any condition change

        updateWimaxIcons();

        for (int sub = 0; sub < TelephonyManager.getDefault().getPhoneCount(); sub++) {

            updateIconSet(sub);

            updateDataNetType(sub);

            updateDataIcon(sub);

            updateTelephonySignalStrength(sub);

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

+4 −2
Original line number Diff line number Diff line
@@ -760,8 +760,9 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                + " showAtLeastThreeGees=" + String.valueOf(mShowAtLeastThreeGees));

        }



        int inetCondition = inetConditionForNetwork(ConnectivityManager.TYPE_MOBILE);

        TelephonyIcons.updateDataType(chosenNetworkType, mShowAtLeastThreeGees,

            mShow4GforLTE, mHspaDataDistinguishable, mInetCondition);

            mShow4GforLTE, mHspaDataDistinguishable, inetCondition);

    }



    protected void updateSimState(Intent intent) {
@@ -900,7 +901,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        }

    }



    private int inetConditionForNetwork(int networkType) {

    protected int inetConditionForNetwork(int networkType) {

        return (mInetCondition == 1 && mConnectedNetworkType == networkType) ? 1 : 0;

    }
@@ -1249,6 +1250,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        }



        // We want to update all the icons, all at once, for any condition change

        updateIconSet();

        updateDataNetType();

        updateWimaxIcons();

        updateDataIcon();