Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev (ab04f860) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/ProviderModelSlice.java

+0 −26

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ import java.util.stream.Collectors;
		public class ProviderModelSlice extends WifiSlice {

		private static final String TAG = "ProviderModelSlice";
		protected static final String ACTION_TITLE_CONNECT_TO_CARRIER = "Connect_To_Carrier";

		private final ProviderModelSliceHelper mHelper;

		@@ -294,31 +293,6 @@ public class ProviderModelSlice extends WifiSlice {
		return SliceAction.createDeeplink(intent, icon, ListBuilder.ICON_IMAGE, title);
		}

		@Override
		protected ListBuilder.RowBuilder getWifiSliceItemRow(WifiSliceItem wifiSliceItem) {
		final CharSequence title = wifiSliceItem.getTitle();
		final IconCompat levelIcon = getWifiSliceItemLevelIcon(wifiSliceItem);
		final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
		.setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
		.setTitle(title)
		.setSubtitle(wifiSliceItem.getSummary())
		.setContentDescription(wifiSliceItem.getContentDescription());

		final IconCompat endIcon;
		if (wifiSliceItem.hasInternetAccess()) {
		rowBuilder.setPrimaryAction(SliceAction.create(getBroadcastIntent(mContext),
		levelIcon, ListBuilder.ICON_IMAGE, ACTION_TITLE_CONNECT_TO_CARRIER));
		endIcon = IconCompat.createWithResource(mContext, R.drawable.ic_settings_close);
		} else {
		rowBuilder.setPrimaryAction(getWifiEntryAction(wifiSliceItem, levelIcon, title));
		endIcon = getEndIcon(wifiSliceItem);
		}
		if (endIcon != null) {
		rowBuilder.addEndItem(endIcon, ListBuilder.ICON_IMAGE);
		}
		return rowBuilder;
		}

		@Override
		protected IconCompat getWifiSliceItemLevelIcon(WifiSliceItem wifiSliceItem) {
		if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED

tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.settings.network;

		import static com.android.settings.network.ProviderModelSlice.ACTION_TITLE_CONNECT_TO_CARRIER;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.any;
		@@ -420,29 +418,4 @@ public class ProviderModelSliceTest {

		verify(mMockNetworkProviderWorker, never()).connectCarrierNetwork();
		}

		@Test
		public void getWifiSliceItemRow_wifiNoInternetAccess_actionConnectToWifiSsid() {
		when(mWifiSliceItem.getKey()).thenReturn("wifi_key");
		when(mWifiSliceItem.getTitle()).thenReturn("wifi_ssid");
		when(mWifiSliceItem.hasInternetAccess()).thenReturn(false);

		ListBuilder.RowBuilder rowBuilder =
		mMockProviderModelSlice.getWifiSliceItemRow(mWifiSliceItem);

		assertThat(rowBuilder.getPrimaryAction().getTitle())
		.isEqualTo("wifi_ssid");
		}

		@Test
		public void getWifiSliceItemRow_wifiHasInternetAccess_actionConnectToCarrier() {
		when(mWifiSliceItem.getTitle()).thenReturn("wifi_ssid");
		when(mWifiSliceItem.hasInternetAccess()).thenReturn(true);

		ListBuilder.RowBuilder rowBuilder =
		mMockProviderModelSlice.getWifiSliceItemRow(mWifiSliceItem);

		assertThat(rowBuilder.getPrimaryAction().getTitle())
		.isEqualTo(ACTION_TITLE_CONNECT_TO_CARRIER);
		}
		}