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

Commit cb4d2efb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SystemUI: always hide roaming indicator"

parents f4fa4df7 c6ed322b

packages/SystemUI/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -322,5 +322,7 @@ 
    <bool name="config_show_long_operator_name_when_roaming">false</bool>

    <!-- Show forbidden and greyed data icon when data is disabled -->

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



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

</resources>

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

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ public class CellularTile extends QSTile<QSTile.SignalState> { 
        state.icon = ResourceIcon.get(iconId);

        state.isOverlayIconWide = cb.isDataTypeIconWide;

        state.isShowRoaming = (!(cb.noSim || !cb.enabled || cb.airplaneModeEnabled)

                && cb.mobileSignalIconId > 0);

                && cb.mobileSignalIconId > 0)

                && !r.getBoolean(R.bool.config_always_hide_roaming_indicator);

        state.subId = cb.subId;

        state.autoMirrorDrawable = !cb.noSim;

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

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

+4 −1
Original line number Diff line number Diff line
@@ -816,7 +816,10 @@ public class MobileSignalController extends SignalController< 
            qsDataTypeIcon = TelephonyIcons.getQSDataTypeIcon(slotId);

        }

        if (roaming && !mContext.getResources().getBoolean(

                    R.bool.show_roaming_and_network_icons) && !(mStyle == STATUS_BAR_STYLE_EXTENDED)) {

                    R.bool.show_roaming_and_network_icons)

                    && !(mStyle == STATUS_BAR_STYLE_EXTENDED)

                    && !mContext.getResources().getBoolean(

                    R.bool.config_always_hide_roaming_indicator)) {

            dataTypeIcon = TelephonyIcons.ROAMING_ICON;

            qsDataTypeIcon = TelephonyIcons.QS_DATA_R;

        }