Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev (93ae7acb) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -2522,12 +2522,6 @@
		<string name="wifi_gateway">Gateway</string>
		<!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
		<string name="wifi_network_prefix_length">Network prefix length</string>
		<!-- Summary for the WiFi Type WIFI_STANDARD_11AX [CHAR LIMIT=50]-->
		<string name="wifi_type_11AX">Wi\u2011Fi 6</string>
		<!-- Summary for the WiFi Type WIFI_STANDARD_11AC [CHAR LIMIT=50]-->
		<string name="wifi_type_11AC">Wi\u2011Fi 5</string>
		<!-- Summary for the WiFi Type WIFI_STANDARD_11N [CHAR LIMIT=50]-->
		<string name="wifi_type_11N">Wi\u2011Fi 4</string>

		<!-- Wi-Fi p2p / Wi-Fi Direct settings -->
		<!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+2 −23

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import android.net.NetworkInfo;
		import android.net.NetworkRequest;
		import android.net.RouteInfo;
		import android.net.Uri;
		import android.net.wifi.ScanResult;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiInfo;
		import android.net.wifi.WifiManager;
		@@ -769,14 +768,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		}

		private void refreshWifiType() {
		final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo();
		if (connectedInfo == null) {
		mTypePref.setVisible(false);
		return;
		}

		final int typeString = getWifiStandardTypeString(connectedInfo.wifiStandard);
		if (typeString != -1) {
		final String typeString = mWifiEntry.getStandardString();
		if (!TextUtils.isEmpty(typeString)) {
		mTypePref.setSummary(typeString);
		mTypePref.setVisible(true);
		} else {
		@@ -784,20 +777,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		}
		}

		private int getWifiStandardTypeString(int wifiStandardType) {
		Log.d(TAG, "Wifi Type " + wifiStandardType);
		switch (wifiStandardType) {
		case ScanResult.WIFI_STANDARD_11AX:
		return R.string.wifi_type_11AX;
		case ScanResult.WIFI_STANDARD_11AC:
		return R.string.wifi_type_11AC;
		case ScanResult.WIFI_STANDARD_11N:
		return R.string.wifi_type_11N;
		default:
		return -1;
		}
		}

		private int getMacAddressTitle() {
		if (mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
		return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED

tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java

+5 −13

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import android.net.NetworkInfo;
		import android.net.NetworkRequest;
		import android.net.RouteInfo;
		import android.net.Uri;
		import android.net.wifi.ScanResult;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiEnterpriseConfig;
		import android.net.wifi.WifiInfo;
		@@ -85,7 +84,6 @@ import com.android.settingslib.widget.LayoutPreference;
		import com.android.wifitrackerlib.NetworkDetailsTracker;
		import com.android.wifitrackerlib.WifiEntry;
		import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
		import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;

		import org.junit.Before;
		import org.junit.Test;
		@@ -943,22 +941,22 @@ public class WifiDetailPreferenceController2Test {
		}

		@Test
		public void onConnectedNetwork_getKnownNetworkType_visibleWifiTypePref() {
		public void onConnectedNetwork_getStandardString_visibleWifiTypePref() {
		setUpForConnectedNetwork();
		setUpSpyController();
		setWifiType(ScanResult.WIFI_STANDARD_11AX);
		when(mMockWifiEntry.getStandardString()).thenReturn("Standard");

		displayAndResume();

		verify(mMockTypePref).setSummary(R.string.wifi_type_11AX);
		verify(mMockTypePref).setSummary("Standard");
		verify(mMockTypePref).setVisible(true);
		}

		@Test
		public void onConnectedNetwork_getUnKnownNetworkType_invisibleWifiTypePref() {
		public void onConnectedNetwork_getEmptyStandardString_invisibleWifiTypePref() {
		setUpForConnectedNetwork();
		setUpSpyController();
		setWifiType(ScanResult.WIFI_STANDARD_UNKNOWN);
		when(mMockWifiEntry.getStandardString()).thenReturn("");

		displayAndResume();

		@@ -974,12 +972,6 @@ public class WifiDetailPreferenceController2Test {
		verify(mMockTypePref).setVisible(false);
		}

		private void setWifiType(int type) {
		ConnectedInfo connectedInfo = new ConnectedInfo();
		connectedInfo.wifiStandard = type;
		when(mMockWifiEntry.getConnectedInfo()).thenReturn(connectedInfo);
		}

		@Test
		public void noCurrentNetwork_shouldNotFinishActivityForConnectedNetwork() {
		setUpForConnectedNetwork();