From e83ebc6c269488b4c1d9b6149bfd270abe2026a8 Mon Sep 17 00:00:00 2001 From: yinxu Date: Tue, 25 May 2021 09:42:00 -0700 Subject: [PATCH] Always display the default network Bug: 188923158 Test: Manual testing Change-Id: I94ce9c478285ca9136b9f463519db2c5c106b40f --- .../systemui/qs/tiles/InternetTile.java | 28 +++++++++++-------- .../phone/StatusBarSignalPolicy.java | 4 +-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index be7adbc77ca11..74d3425edd221 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -430,12 +430,14 @@ public class InternetTile extends QSTileImpl { } else { state.icon = ResourceIcon.get(cb.mWifiSignalIconId); } - } else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); - state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); - } else if (cb.mNoValidatedNetwork && !cb.mNoNetworksAvailable) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); - state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); + } else if (cb.mNoDefaultNetwork) { + if (cb.mNoNetworksAvailable) { + state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); + } else { + state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); + state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); + } } else if (cb.mIsTransient) { state.icon = ResourceIcon.get( com.android.internal.R.drawable.ic_signal_wifi_transient_animation); @@ -488,12 +490,14 @@ public class InternetTile extends QSTileImpl { state.state = Tile.STATE_INACTIVE; state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); state.secondaryLabel = r.getString(R.string.status_bar_airplane); - } else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); - state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); - } else if (cb.mNoValidatedNetwork && !cb.mNoNetworksAvailable) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); - state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); + } else if (cb.mNoDefaultNetwork) { + if (cb.mNoNetworksAvailable) { + state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); + } else { + state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); + state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); + } } else { state.icon = new SignalIcon(cb.mMobileSignalIconId); state.secondaryLabel = appendMobileDataType(cb.mDataSubscriptionName, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index ebf2465f3bf39..06d754899b911 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -172,7 +172,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba && !mIsAirplaneMode) { newState.visible = true; newState.resId = R.drawable.ic_qs_no_internet_unavailable; - } else if (mWifiIconState.noValidatedNetwork && !mWifiIconState.noNetworksAvailable + } else if (mWifiIconState.noDefaultNetwork && !mWifiIconState.noNetworksAvailable && (!mIsAirplaneMode || (mIsAirplaneMode && mIsWifiEnabled))) { newState.visible = true; newState.resId = R.drawable.ic_qs_no_internet_available; @@ -377,7 +377,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba if (noDefaultNetwork && noNetworksAvailable && !mIsAirplaneMode) { newState.visible = true; newState.resId = R.drawable.ic_qs_no_internet_unavailable; - } else if (noValidatedNetwork && !noNetworksAvailable + } else if (noDefaultNetwork && !noNetworksAvailable && (!mIsAirplaneMode || (mIsAirplaneMode && mIsWifiEnabled))) { newState.visible = true; newState.resId = R.drawable.ic_qs_no_internet_available;