Reapply "SystemUI: Allow Wi-Fi/cell tiles to co-exist with provider model" (429f5d14) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -303,6 +303,9 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> {
		if (DEBUG) {
		Log.d(TAG, "setWifiIndicators: " + indicators);
		}
		if (!indicators.isDefault) {
		return;
		}
		synchronized (mWifiInfo) {
		mWifiInfo.mEnabled = indicators.enabled;
		mWifiInfo.mSsid = indicators.description;
		@@ -328,7 +331,7 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> {
		if (DEBUG) {
		Log.d(TAG, "setMobileDataIndicators: " + indicators);
		}
		if (indicators.qsIcon == null) {
		if (indicators.qsIcon == null \|\| !indicators.isDefault) {
		// Not data sim, don't display.
		return;
		}

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -289,7 +289,8 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
		qsInfo.description,
		mSubscriptionInfo.getSubscriptionId(),
		mCurrentState.roaming,
		sbInfo.showTriangle);
		sbInfo.showTriangle,
		mCurrentState.isDefault);
		callback.setMobileDataIndicators(mobileDataIndicators);
		}

		@@ -299,11 +300,6 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
		CharSequence qsDescription = null;

		if (mCurrentState.dataSim) {
		// only show QS icons if the state is also default
		if (!mCurrentState.isDefault) {
		return new QsInfo(qsTypeIcon, qsIcon, qsDescription);
		}

		if (mCurrentState.showQuickSettingsRatIcon() \|\| mConfig.alwaysShowDataRatIcon) {
		qsTypeIcon = dataTypeIcon;
		}

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalCallback.kt

+6 −2

Original line number	Diff line number	Diff line
		@@ -113,7 +113,8 @@ data class WifiIndicators(
		@JvmField val activityOut: Boolean,
		@JvmField val description: String?,
		@JvmField val isTransient: Boolean,
		@JvmField val statusLabel: String?
		@JvmField val statusLabel: String?,
		@JvmField val isDefault: Boolean
		) {
		override fun toString(): String {
		return StringBuilder("WifiIndicators[")
		@@ -125,6 +126,7 @@ data class WifiIndicators(
		.append(",qsDescription=").append(description)
		.append(",isTransient=").append(isTransient)
		.append(",statusLabel=").append(statusLabel)
		.append(",isDefault=").append(isDefault)
		.append(']').toString()
		}
		}
		@@ -142,7 +144,8 @@ data class MobileDataIndicators(
		@JvmField val qsDescription: CharSequence?,
		@JvmField val subId: Int,
		@JvmField val roaming: Boolean,
		@JvmField val showTriangle: Boolean
		@JvmField val showTriangle: Boolean,
		@JvmField val isDefault: Boolean
		) {
		override fun toString(): String {
		return java.lang.StringBuilder("MobileDataIndicators[")
		@@ -158,6 +161,7 @@ data class MobileDataIndicators(
		.append(",subId=").append(subId)
		.append(",roaming=").append(roaming)
		.append(",showTriangle=").append(showTriangle)
		.append(",isDefault=").append(isDefault)
		.append(']').toString()
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -112,18 +112,16 @@ public class WifiSignalController extends SignalController<WifiState, IconGroup>
		}
		IconState statusIcon = new IconState(
		wifiVisible, getCurrentIconId(), contentDescription);
		IconState qsIcon = null;
		if (mCurrentState.isDefault \|\| (!mNetworkController.isRadioOn()
		&& !mNetworkController.isEthernetDefault())) {
		qsIcon = new IconState(mCurrentState.connected,
		IconState qsIcon = new IconState(mCurrentState.connected,
		mWifiTracker.isCaptivePortal ? R.drawable.ic_qs_wifi_disconnected
		: getQsCurrentIconId(), contentDescription);
		}
		boolean isDefault = mCurrentState.isDefault \|\| (!mNetworkController.isRadioOn()
		&& !mNetworkController.isEthernetDefault());
		WifiIndicators wifiIndicators = new WifiIndicators(
		mCurrentState.enabled, statusIcon, qsIcon,
		ssidPresent && mCurrentState.activityIn,
		ssidPresent && mCurrentState.activityOut,
		wifiDesc, mCurrentState.isTransient, mCurrentState.statusLabel
		wifiDesc, mCurrentState.isTransient, mCurrentState.statusLabel, isDefault
		);
		callback.setWifiIndicators(wifiIndicators);
		}
		@@ -156,7 +154,8 @@ public class WifiSignalController extends SignalController<WifiState, IconGroup>
		statusIcon, qsIcon, typeIcon, qsTypeIcon,
		mCurrentState.activityIn, mCurrentState.activityOut, dataContentDescription,
		dataContentDescriptionHtml, description,
		mCurrentState.subId, /* roaming= / false, / showTriangle= */ true
		mCurrentState.subId, /* roaming= / false, / showTriangle= */ true,
		/* isDefault= */ qsIcon != null
		);
		callback.setMobileDataIndicators(mobileDataIndicators);
		}

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ public class CastTileTest extends SysuiTestCase {
		WifiIndicators indicators = new WifiIndicators(
		false, mock(IconState.class),
		qsIcon, false, false, "",
		false, "");
		false, "", true);
		mSignalCallback.setWifiIndicators(indicators);
		mTestableLooper.processAllMessages();

		@@ -152,7 +152,7 @@ public class CastTileTest extends SysuiTestCase {
		WifiIndicators indicators = new WifiIndicators(
		true, mock(IconState.class),
		qsIcon, false, false, "",
		false, "");
		false, "", true);
		mSignalCallback.setWifiIndicators(indicators);
		mTestableLooper.processAllMessages();

		@@ -164,7 +164,7 @@ public class CastTileTest extends SysuiTestCase {
		WifiIndicators indicators = new WifiIndicators(
		true, mock(IconState.class),
		qsIcon, false, false, "",
		false, "");
		false, "", true);
		mSignalCallback.setWifiIndicators(indicators);
		mTestableLooper.processAllMessages();
		}