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

Merge "Only allows Carrier Merged WiFi when APM is on" into sc-dev am: 6d913ca6b3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia92321ec882d77f9376c23b0f64fdc0f824d294a
This commit is contained in:
Ying Xu
2021-01-28 17:27:59 +00:00
committed by Automerger Merge Worker
parent 87b498436b 6d913ca6b3
commit 841a80b67e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.graph.SignalDrawable;
import com.android.settingslib.mobile.TelephonyIcons;
import com.android.settingslib.net.DataUsageController;
import com.android.systemui.R;
import com.android.systemui.dagger.qualifiers.Background;
@@ -178,6 +179,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
CharSequence mDataSubscriptionName;
CharSequence mDataContentDescription;
int mMobileSignalIconId;
int mQsTypeIcon;
boolean mActivityIn;
boolean mActivityOut;
boolean mNoSim;
@@ -194,6 +196,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
.append(",mDataSubscriptionName=").append(mDataSubscriptionName)
.append(",mDataContentDescription=").append(mDataContentDescription)
.append(",mMobileSignalIconId=").append(mMobileSignalIconId)
.append(",mQsTypeIcon=").append(mQsTypeIcon)
.append(",mActivityIn=").append(mActivityIn)
.append(",mActivityOut=").append(mActivityOut)
.append(",mNoSim=").append(mNoSim)
@@ -275,6 +278,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
mCellularInfo.mDataContentDescription =
(description != null) ? typeContentDescriptionHtml : null;
mCellularInfo.mMobileSignalIconId = qsIcon.icon;
mCellularInfo.mQsTypeIcon = qsType;
mCellularInfo.mActivityIn = activityIn;
mCellularInfo.mActivityOut = activityOut;
mCellularInfo.mRoaming = roaming;
@@ -293,6 +297,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
if (mCellularInfo.mNoSim) {
// Make sure signal gets cleared out when no sims.
mCellularInfo.mMobileSignalIconId = 0;
mCellularInfo.mQsTypeIcon = 0;
}
refreshState(mCellularInfo);
}
@@ -375,6 +380,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
state.label = r.getString(R.string.quick_settings_internet_label);
if (cb.mAirplaneModeEnabled) {
if (!state.value) {
state.state = Tile.STATE_INACTIVE;
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_airplane);
state.secondaryLabel = r.getString(R.string.status_bar_airplane);
} else if (!wifiConnected) {
@@ -444,7 +450,8 @@ public class InternetTile extends QSTileImpl<SignalState> {
state.activityOut = mobileDataEnabled && cb.mActivityOut;
state.expandedAccessibilityClassName = Switch.class.getName();
if (cb.mAirplaneModeEnabled && cb.mNoDefaultNetwork) {
if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) {
state.state = Tile.STATE_INACTIVE;
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_airplane);
state.secondaryLabel = r.getString(R.string.status_bar_airplane);
} else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) {