PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove On/Off subtext next to the Wi-Fi toggle" into qt-dev am: 8bc21da216

Browse Source 
am: 28d513fc32

Change-Id: I58d2b2a50eda5155bb70810325897a46c916e14a
This commit is contained in:
Jason Chiu
2019-05-13 22:17:11 -07:00
committed by android-build-merger
parent 1a48e4cf9b 28d513fc32
commit 1568c82bc9
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
View File

@@ -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<SliceItem> sliceItems = wifiSlice.getItems();
SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
assertCaptivePortalItems(sliceItems);
}
private void assertCaptivePortalItems(List<SliceItem> 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);
}