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

Merge "Do not display "Network Available" when WiFi disabled." into sc-qpr1-dev

Browse Source
This commit is contained in:
Xi Han
2021-08-13 21:09:53 +00:00
committed by Android (Google) Code Review
parent 47e2fa60c2 ee4c4195b6
commit b8655177fe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,7 +429,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
state.icon = ResourceIcon.get(cb.mWifiSignalIconId); state.icon = ResourceIcon.get(cb.mWifiSignalIconId);
} }
} else if (cb.mNoDefaultNetwork) { } else if (cb.mNoDefaultNetwork) {
if (cb.mNoNetworksAvailable) { if (cb.mNoNetworksAvailable || !cb.mEnabled) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable);
} else { } else {
@@ -489,7 +489,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
state.secondaryLabel = r.getString(R.string.status_bar_airplane); state.secondaryLabel = r.getString(R.string.status_bar_airplane);
} else if (cb.mNoDefaultNetwork) { } else if (cb.mNoDefaultNetwork) {
if (cb.mNoNetworksAvailable) { if (cb.mNoNetworksAvailable || !mSignalCallback.mWifiInfo.mEnabled) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable);
} else { } else {