diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java index 9be98988d6b..e5c8de59f8c 100644 --- a/src/com/android/settings/wifi/slice/WifiSlice.java +++ b/src/com/android/settings/wifi/slice/WifiSlice.java @@ -149,7 +149,6 @@ public class WifiSlice implements CustomSliceable { final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_settings_wireless); final String title = mContext.getString(R.string.wifi_settings); - final CharSequence summary = getSummary(); final PendingIntent toggleAction = getBroadcastIntent(mContext); final PendingIntent primaryAction = getPrimaryAction(); final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon, @@ -162,7 +161,6 @@ public class WifiSlice implements CustomSliceable { .setKeywords(getKeywords()) .addRow(new ListBuilder.RowBuilder() .setTitle(title) - .setSubtitle(summary) .addEndItem(toggleSliceAction) .setPrimaryAction(primarySliceAction)); } @@ -338,20 +336,6 @@ public class WifiSlice implements CustomSliceable { } } - private CharSequence getSummary() { - switch (mWifiManager.getWifiState()) { - case WifiManager.WIFI_STATE_ENABLED: - case WifiManager.WIFI_STATE_ENABLING: - return mContext.getText(R.string.switch_on_text); - case WifiManager.WIFI_STATE_DISABLED: - case WifiManager.WIFI_STATE_DISABLING: - return mContext.getText(R.string.switch_off_text); - case WifiManager.WIFI_STATE_UNKNOWN: - default: - return null; - } - } - private PendingIntent getPrimaryAction() { final Intent intent = getIntent(); return PendingIntent.getActivity(mContext, 0 /* requestCode */, diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java index fabc50ec4aa..18ed0065c2b 100644 --- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java @@ -238,20 +238,13 @@ public class WifiSliceTest { setWorkerResults(createAccessPoint(AP1_NAME, true, true)); doReturn(makeCaptivePortalNetworkCapabilities()).when(mConnectivityManager) .getNetworkCapabilities(any()); + final IconCompat expectedIcon = IconCompat.createWithResource(mContext, + R.drawable.ic_settings_accent); final Slice wifiSlice = mWifiSlice.getSlice(); final List sliceItems = wifiSlice.getItems(); SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME); - assertCaptivePortalItems(sliceItems); - } - - private void assertCaptivePortalItems(List sliceItems) { - final String expectedSummary = mContext.getString(R.string.switch_on_text); - SliceTester.assertAnySliceItemContainsSubtitle(sliceItems, expectedSummary); - - final IconCompat expectedIcon = IconCompat.createWithResource(mContext, - R.drawable.ic_settings_accent); SliceTester.assertAnySliceItemContainsIcon(sliceItems, expectedIcon); }