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

Merge "Remove the activity info from InternetTile" into tm-qpr-dev

Browse Source
This commit is contained in:
Ying Xu
2022-12-05 22:43:36 +00:00
committed by Android (Google) Code Review
parent 4556613637 9ed1c59414
commit b250c79ea6
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
View File

@@ -184,8 +184,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
int mWifiSignalIconId; int mWifiSignalIconId;
@Nullable @Nullable
String mSsid; String mSsid;
boolean mActivityIn;
boolean mActivityOut;
@Nullable @Nullable
String mWifiSignalContentDescription; String mWifiSignalContentDescription;
boolean mIsTransient; boolean mIsTransient;
@@ -203,8 +201,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
.append(",mConnected=").append(mConnected) .append(",mConnected=").append(mConnected)
.append(",mWifiSignalIconId=").append(mWifiSignalIconId) .append(",mWifiSignalIconId=").append(mWifiSignalIconId)
.append(",mSsid=").append(mSsid) .append(",mSsid=").append(mSsid)
.append(",mActivityIn=").append(mActivityIn)
.append(",mActivityOut=").append(mActivityOut)
.append(",mWifiSignalContentDescription=").append(mWifiSignalContentDescription) .append(",mWifiSignalContentDescription=").append(mWifiSignalContentDescription)
.append(",mIsTransient=").append(mIsTransient) .append(",mIsTransient=").append(mIsTransient)
.append(",mNoDefaultNetwork=").append(mNoDefaultNetwork) .append(",mNoDefaultNetwork=").append(mNoDefaultNetwork)
@@ -222,8 +218,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
CharSequence mDataContentDescription; CharSequence mDataContentDescription;
int mMobileSignalIconId; int mMobileSignalIconId;
int mQsTypeIcon; int mQsTypeIcon;
boolean mActivityIn;
boolean mActivityOut;
boolean mNoSim; boolean mNoSim;
boolean mRoaming; boolean mRoaming;
boolean mMultipleSubs; boolean mMultipleSubs;
@@ -239,8 +233,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
.append(",mDataContentDescription=").append(mDataContentDescription) .append(",mDataContentDescription=").append(mDataContentDescription)
.append(",mMobileSignalIconId=").append(mMobileSignalIconId) .append(",mMobileSignalIconId=").append(mMobileSignalIconId)
.append(",mQsTypeIcon=").append(mQsTypeIcon) .append(",mQsTypeIcon=").append(mQsTypeIcon)
.append(",mActivityIn=").append(mActivityIn)
.append(",mActivityOut=").append(mActivityOut)
.append(",mNoSim=").append(mNoSim) .append(",mNoSim=").append(mNoSim)
.append(",mRoaming=").append(mRoaming) .append(",mRoaming=").append(mRoaming)
.append(",mMultipleSubs=").append(mMultipleSubs) .append(",mMultipleSubs=").append(mMultipleSubs)
@@ -271,8 +263,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
mWifiInfo.mWifiSignalContentDescription = indicators.qsIcon.contentDescription; mWifiInfo.mWifiSignalContentDescription = indicators.qsIcon.contentDescription;
mWifiInfo.mEnabled = indicators.enabled; mWifiInfo.mEnabled = indicators.enabled;
mWifiInfo.mSsid = indicators.description; mWifiInfo.mSsid = indicators.description;
mWifiInfo.mActivityIn = indicators.activityIn;
mWifiInfo.mActivityOut = indicators.activityOut;
mWifiInfo.mIsTransient = indicators.isTransient; mWifiInfo.mIsTransient = indicators.isTransient;
mWifiInfo.mStatusLabel = indicators.statusLabel; mWifiInfo.mStatusLabel = indicators.statusLabel;
refreshState(mWifiInfo); refreshState(mWifiInfo);
@@ -293,8 +283,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
? indicators.typeContentDescriptionHtml : null; ? indicators.typeContentDescriptionHtml : null;
mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon; mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon;
mCellularInfo.mQsTypeIcon = indicators.qsType; mCellularInfo.mQsTypeIcon = indicators.qsType;
mCellularInfo.mActivityIn = indicators.activityIn;
mCellularInfo.mActivityOut = indicators.activityOut;
mCellularInfo.mRoaming = indicators.roaming; mCellularInfo.mRoaming = indicators.roaming;
mCellularInfo.mMultipleSubs = mController.getNumberSubscriptions() > 1; mCellularInfo.mMultipleSubs = mController.getNumberSubscriptions() > 1;
refreshState(mCellularInfo); refreshState(mCellularInfo);
@@ -424,8 +412,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
state.state = Tile.STATE_ACTIVE; state.state = Tile.STATE_ACTIVE;
state.dualTarget = true; state.dualTarget = true;
state.value = cb.mEnabled; state.value = cb.mEnabled;
state.activityIn = cb.mEnabled && cb.mActivityIn;
state.activityOut = cb.mEnabled && cb.mActivityOut;
final StringBuffer minimalContentDescription = new StringBuffer(); final StringBuffer minimalContentDescription = new StringBuffer();
final StringBuffer minimalStateDescription = new StringBuffer(); final StringBuffer minimalStateDescription = new StringBuffer();
final Resources r = mContext.getResources(); final Resources r = mContext.getResources();
@@ -499,8 +485,6 @@ public class InternetTile extends QSTileImpl<SignalState> {
boolean mobileDataEnabled = mDataController.isMobileDataSupported() boolean mobileDataEnabled = mDataController.isMobileDataSupported()
&& mDataController.isMobileDataEnabled(); && mDataController.isMobileDataEnabled();
state.value = mobileDataEnabled; state.value = mobileDataEnabled;
state.activityIn = mobileDataEnabled && cb.mActivityIn;
state.activityOut = mobileDataEnabled && cb.mActivityOut;
state.expandedAccessibilityClassName = Switch.class.getName(); state.expandedAccessibilityClassName = Switch.class.getName();
if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) { if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) {