Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove qsDataType since it was the same as dataType am: 0b90863da9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15740840

Change-Id: I8f1b81bae3d3e5c5a961e0cfd47ed41a6db5d29d
This commit is contained in:
Evan Laird
2021-09-24 23:32:38 +00:00
committed by Automerger Merge Worker
parent 25d6389e9b 0b90863da9
commit 9688a8e3d6
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/SignalIcon.java
View File

@@ -139,7 +139,6 @@ public class SignalIcon {
public static class MobileIconGroup extends IconGroup { public static class MobileIconGroup extends IconGroup {
public final int dataContentDescription; // mContentDescriptionDataType public final int dataContentDescription; // mContentDescriptionDataType
public final int dataType; public final int dataType;
public final int qsDataType;
public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc, public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc,
int sbNullState, int qsNullState, int sbDiscState, int qsDiscState, int sbNullState, int qsNullState, int sbDiscState, int qsDiscState,
@@ -148,7 +147,6 @@ public class SignalIcon {
qsDiscState, discContentDesc); qsDiscState, discContentDesc);
this.dataContentDescription = dataContentDesc; this.dataContentDescription = dataContentDesc;
this.dataType = dataType; this.dataType = dataType;
this.qsDataType = dataType; // TODO: remove this field
} }
} }

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

@@ -399,7 +399,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
// Only send data sim callbacks to QS. // Only send data sim callbacks to QS.
if (mCurrentState.dataSim && mCurrentState.isDefault) { if (mCurrentState.dataSim && mCurrentState.isDefault) {
qsTypeIcon = qsTypeIcon =
(showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0; (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;
qsIcon = new IconState(mCurrentState.enabled qsIcon = new IconState(mCurrentState.enabled
&& !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription); && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription);
description = mCurrentState.isEmergency ? null : mCurrentState.networkName; description = mCurrentState.isEmergency ? null : mCurrentState.networkName;
@@ -435,7 +435,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
if (mProviderModelSetting) { if (mProviderModelSetting) {
if (mCurrentState.dataSim && mCurrentState.isDefault) { if (mCurrentState.dataSim && mCurrentState.isDefault) {
qsTypeIcon = qsTypeIcon =
(showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0; (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;
qsIcon = new IconState( qsIcon = new IconState(
mCurrentState.enabled && !mCurrentState.isEmergency, mCurrentState.enabled && !mCurrentState.isEmergency,
getQsCurrentIconId(), contentDescription); getQsCurrentIconId(), contentDescription);
@@ -444,7 +444,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
} else { } else {
if (mCurrentState.dataSim) { if (mCurrentState.dataSim) {
qsTypeIcon = qsTypeIcon =
(showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0; (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;
qsIcon = new IconState( qsIcon = new IconState(
mCurrentState.enabled && !mCurrentState.isEmergency, mCurrentState.enabled && !mCurrentState.isEmergency,
getQsCurrentIconId(), contentDescription); getQsCurrentIconId(), contentDescription);

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

@@ -163,7 +163,7 @@ public class WifiSignalController extends
int qsTypeIcon = 0; int qsTypeIcon = 0;
IconState qsIcon = null; IconState qsIcon = null;
if (sbVisible) { if (sbVisible) {
qsTypeIcon = icons.qsDataType; qsTypeIcon = icons.dataType;
qsIcon = new IconState(mCurrentState.connected, getQsCurrentIconIdForCarrierWifi(), qsIcon = new IconState(mCurrentState.connected, getQsCurrentIconIdForCarrierWifi(),
contentDescription); contentDescription);
} }