Merge "Remove data icon for WFC" into mnc-dev (58599104) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ public class MobileSignalController extends SignalController<
		} else {
		mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.LTE);
		}
		mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.FOUR_G);
		mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.WFC);
		}

		@Override

+12 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,18 @@ class TelephonyIcons {
		TelephonyIcons.QS_DATA_3G
		);

		static final MobileIconGroup WFC = new MobileIconGroup(
		"WFC",
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH,
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH,
		AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH,
		0, 0,
		TelephonyIcons.TELEPHONY_NO_NETWORK,
		TelephonyIcons.QS_TELEPHONY_NO_NETWORK,
		AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],
		0, 0, false, 0
		);

		static final MobileIconGroup UNKNOWN = new MobileIconGroup(
		"Unknown",
		TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH,

+8 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,14 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
		TelephonyIcons.QS_DATA_H);
		}

		public void testWfcNoDataIcon() {
		setupDefaultSignal();
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_IWLAN);

		verifyDataIndicators(0, 0);
		}

		public void test4gDataIcon() {
		// Switch to showing 4g icon and re-initialize the NetworkController.
		mConfig.show4gForLte = true;