Merge "Always display the default network" into sc-dev (945334a3) · Commits · e / os / android_frameworks_base

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

+16 −12

Original line number	Diff line number	Diff line
		@@ -430,12 +430,14 @@ public class InternetTile extends QSTileImpl<SignalState> {
		} else {
		state.icon = ResourceIcon.get(cb.mWifiSignalIconId);
		}
		} else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) {
		} 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 if (cb.mNoValidatedNetwork && !cb.mNoNetworksAvailable) {
		} 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<SignalState> {
		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) {
		} 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 if (cb.mNoValidatedNetwork && !cb.mNoNetworksAvailable) {
		} 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,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -175,7 +175,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;
		@@ -380,7 +380,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;