Add prompt to sign in at captive portal to Wi-Fi Slice
- Support signing in captive portal APs in WifiSlice
- Show ContextualWifiSlice when signing in is required
- Generifies SliceBackgroundWorker.getInstance() to return <T extends SliceBackgroundWorker>
Fixes: 128056349
Test: make RunSettingsRoboTests -j
Change-Id: Ib4d3942591a65e81018389e4c0bbddfea6854dbc
(cherry picked from commit dd9f92280b
)
This commit is contained in:
committed by
Tsung-Mao Fang
parent
44427259e8
commit
8f6c06974c
@@ -18,6 +18,7 @@ package com.android.settings.testutils;
|
||||
|
||||
import static android.app.slice.Slice.HINT_TITLE;
|
||||
import static android.app.slice.Slice.SUBTYPE_COLOR;
|
||||
import static android.app.slice.SliceItem.FORMAT_IMAGE;
|
||||
import static android.app.slice.SliceItem.FORMAT_INT;
|
||||
import static android.app.slice.SliceItem.FORMAT_TEXT;
|
||||
|
||||
@@ -284,6 +285,31 @@ public class SliceTester {
|
||||
return hasText;
|
||||
}
|
||||
|
||||
/**
|
||||
* Assert any slice item contains icon.
|
||||
*
|
||||
* @param sliceItems All slice items of a Slice.
|
||||
* @param icon Icon for asserting.
|
||||
*/
|
||||
public static void assertAnySliceItemContainsIcon(List<SliceItem> sliceItems, IconCompat icon) {
|
||||
boolean hasIcon = false;
|
||||
for (SliceItem item : sliceItems) {
|
||||
List<SliceItem> iconItems = SliceQuery.findAll(item, FORMAT_IMAGE,
|
||||
(String) null /* hints */, null /* non-hints */);
|
||||
if (iconItems == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (SliceItem iconItem : iconItems) {
|
||||
if (icon.toString().equals(iconItem.getIcon().toString())) {
|
||||
hasIcon = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
assertThat(hasIcon).isTrue();
|
||||
}
|
||||
|
||||
private static void assertKeywords(SliceMetadata metadata, SliceData data) {
|
||||
final List<String> keywords = metadata.getSliceKeywords();
|
||||
final Set<String> expectedKeywords = Arrays.stream(data.getKeywords().split(","))
|
||||
|
Reference in New Issue
Block a user