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

Commit 0b90863d authored by Evan Laird's avatar Evan Laird
Browse files

Remove qsDataType since it was the same as dataType 

This resolves a TODO and removes unused fields

Test: atest SystemUITests
Bug: 197851948
Change-Id: I5e2eb4896966516f34980863e18b99368f395b20
Merged-In: I5e2eb4896966516f34980863e18b99368f395b20
parent 379fc8cd

packages/SettingsLib/src/com/android/settingslib/SignalIcon.java

+0 −2
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ public class SignalIcon { 
    public static class MobileIconGroup extends IconGroup {

        public final int dataContentDescription; // mContentDescriptionDataType

        public final int dataType;

        public final int qsDataType;



        public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc,

                int sbNullState, int qsNullState, int sbDiscState, int qsDiscState,
@@ -148,7 +147,6 @@ public class SignalIcon { 
                qsDiscState, discContentDesc);

            this.dataContentDescription = dataContentDesc;

            this.dataType = dataType;

            this.qsDataType = dataType; // TODO: remove this field

        }

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
            // Only send data sim callbacks to QS.

            if (mCurrentState.dataSim && mCurrentState.isDefault) {

                qsTypeIcon =

                        (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0;

                        (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;

                qsIcon = new IconState(mCurrentState.enabled

                        && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription);

                description = mCurrentState.isEmergency ? null : mCurrentState.networkName;
@@ -435,7 +435,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
            if (mProviderModelSetting) {

                if (mCurrentState.dataSim && mCurrentState.isDefault) {

                    qsTypeIcon =

                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0;

                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;

                    qsIcon = new IconState(

                            mCurrentState.enabled && !mCurrentState.isEmergency,

                            getQsCurrentIconId(), contentDescription);
@@ -444,7 +444,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
            } else {

                if (mCurrentState.dataSim) {

                    qsTypeIcon =

                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0;

                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;

                    qsIcon = new IconState(

                            mCurrentState.enabled && !mCurrentState.isEmergency,

                            getQsCurrentIconId(), contentDescription);

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class WifiSignalController extends 
        int qsTypeIcon = 0;

        IconState qsIcon = null;

        if (sbVisible) {

            qsTypeIcon = icons.qsDataType;

            qsTypeIcon = icons.dataType;

            qsIcon = new IconState(mCurrentState.connected, getQsCurrentIconIdForCarrierWifi(),

                    contentDescription);

        }