Merge "Do not display "Network Available" when WiFi disabled." into sc-qpr1-dev (b8655177) · Commits · e / os / android_frameworks_base

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

+2 −2

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