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

Commit bae051f6 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev

parents be3731f0 ccda9966

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

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

        state.isOverlayIconWide = cb.isDataTypeIconWide;

        state.autoMirrorDrawable = !cb.noSim;

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

                ? cb.dataTypeIconId

                : 0;

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

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

        state.activityIn = cb.enabled && cb.activityIn;

        state.activityOut = cb.enabled && cb.activityOut;

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

+5 −4
Original line number Diff line number Diff line
@@ -1187,10 +1187,13 @@ public class NetworkControllerImpl extends BroadcastReceiver 


            String contentDescription = getStringIfExists(getContentDescription());

            String dataContentDescription = getStringIfExists(icons.mDataContentDescription);



            boolean showDataIcon = mCurrentState.dataConnected && mCurrentState.inetForNetwork != 0

                    || mCurrentState.iconGroup == TelephonyIcons.ROAMING;



            // Only send data sim callbacks to QS.

            if (mCurrentState.dataSim) {

                int qsTypeIcon = mCurrentState.dataConnected ?

                        icons.mQsDataType[mCurrentState.inetForNetwork] : 0;

                int qsTypeIcon = showDataIcon ? icons.mQsDataType[mCurrentState.inetForNetwork] : 0;

                int length = mSignalsChangedCallbacks.size();

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

                    mSignalsChangedCallbacks.get(i).onMobileDataSignalChanged(mCurrentState.enabled
@@ -1205,8 +1208,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                            icons.mIsWide && qsTypeIcon != 0);

                }

            }

            boolean showDataIcon = mCurrentState.dataConnected && mCurrentState.inetForNetwork != 0

                    || mCurrentState.iconGroup == TelephonyIcons.ROAMING;

            int typeIcon = showDataIcon ? icons.mDataType : 0;

            int signalClustersLength = mSignalClusters.size();

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