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

Merge "Replace the globe+airplane icon with gblobe+x icon" into sc-dev am: 2ca035474a

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

Change-Id: Id7176161039ad879391ed5a446edffcbd310c753
This commit is contained in:
TreeHugger Robot
2021-05-26 00:00:40 +00:00
committed by Automerger Merge Worker
parent 699555f455 2ca035474a
commit c8173aaa9a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,10 +416,10 @@ public class InternetTile extends QSTileImpl<SignalState> {
if (cb.mAirplaneModeEnabled) { if (cb.mAirplaneModeEnabled) {
if (!state.value) { if (!state.value) {
state.state = Tile.STATE_INACTIVE; state.state = Tile.STATE_INACTIVE;
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_airplane); 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 (!wifiConnected) { } else if (!wifiConnected) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_airplane); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
if (cb.mNoNetworksAvailable) { if (cb.mNoNetworksAvailable) {
state.secondaryLabel = state.secondaryLabel =
r.getString(R.string.quick_settings_networks_unavailable); r.getString(R.string.quick_settings_networks_unavailable);
@@ -486,7 +486,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) { if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) {
state.state = Tile.STATE_INACTIVE; state.state = Tile.STATE_INACTIVE;
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_airplane); 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 && cb.mNoNetworksAvailable) { } else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);