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

Merge "Always display the default network" into sc-dev am: 945334a3dd

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

Change-Id: Iab879615c06aeb99d33cac484f4903cdc446e1f8
This commit is contained in:
TreeHugger Robot
2021-05-26 17:21:32 +00:00
committed by Automerger Merge Worker
parent 28c8e6e906 945334a3dd
commit 7e326edecc
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,12 +430,14 @@ public class InternetTile extends QSTileImpl<SignalState> {
} else { } else {
state.icon = ResourceIcon.get(cb.mWifiSignalIconId); state.icon = ResourceIcon.get(cb.mWifiSignalIconId);
} }
} else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) { } else if (cb.mNoDefaultNetwork) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); if (cb.mNoNetworksAvailable) {
state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
} else if (cb.mNoValidatedNetwork && !cb.mNoNetworksAvailable) { state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable);
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); } else {
state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); 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) { } else if (cb.mIsTransient) {
state.icon = ResourceIcon.get( state.icon = ResourceIcon.get(
com.android.internal.R.drawable.ic_signal_wifi_transient_animation); com.android.internal.R.drawable.ic_signal_wifi_transient_animation);
@@ -488,12 +490,14 @@ public class InternetTile extends QSTileImpl<SignalState> {
state.state = Tile.STATE_INACTIVE; state.state = Tile.STATE_INACTIVE;
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 && cb.mNoNetworksAvailable) { } else if (cb.mNoDefaultNetwork) {
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); if (cb.mNoNetworksAvailable) {
state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
} else if (cb.mNoValidatedNetwork && !cb.mNoNetworksAvailable) { state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable);
state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); } else {
state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available);
state.secondaryLabel = r.getString(R.string.quick_settings_networks_available);
}
} else { } else {
state.icon = new SignalIcon(cb.mMobileSignalIconId); state.icon = new SignalIcon(cb.mMobileSignalIconId);
state.secondaryLabel = appendMobileDataType(cb.mDataSubscriptionName, state.secondaryLabel = appendMobileDataType(cb.mDataSubscriptionName,

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java
View File

@@ -175,7 +175,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba
&& !mIsAirplaneMode) { && !mIsAirplaneMode) {
newState.visible = true; newState.visible = true;
newState.resId = R.drawable.ic_qs_no_internet_unavailable; newState.resId = R.drawable.ic_qs_no_internet_unavailable;
} else if (mWifiIconState.noValidatedNetwork && !mWifiIconState.noNetworksAvailable } else if (mWifiIconState.noDefaultNetwork && !mWifiIconState.noNetworksAvailable
&& (!mIsAirplaneMode || (mIsAirplaneMode && mIsWifiEnabled))) { && (!mIsAirplaneMode || (mIsAirplaneMode && mIsWifiEnabled))) {
newState.visible = true; newState.visible = true;
newState.resId = R.drawable.ic_qs_no_internet_available; newState.resId = R.drawable.ic_qs_no_internet_available;
@@ -380,7 +380,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba
if (noDefaultNetwork && noNetworksAvailable && !mIsAirplaneMode) { if (noDefaultNetwork && noNetworksAvailable && !mIsAirplaneMode) {
newState.visible = true; newState.visible = true;
newState.resId = R.drawable.ic_qs_no_internet_unavailable; newState.resId = R.drawable.ic_qs_no_internet_unavailable;
} else if (noValidatedNetwork && !noNetworksAvailable } else if (noDefaultNetwork && !noNetworksAvailable
&& (!mIsAirplaneMode || (mIsAirplaneMode && mIsWifiEnabled))) { && (!mIsAirplaneMode || (mIsAirplaneMode && mIsWifiEnabled))) {
newState.visible = true; newState.visible = true;
newState.resId = R.drawable.ic_qs_no_internet_available; newState.resId = R.drawable.ic_qs_no_internet_available;