Merge "Add keywords for wifi slice"
This commit is contained in:
committed by
Android (Google) Code Review
commit
3a00f3bf81
@@ -65,7 +65,10 @@ import com.android.settingslib.wifi.AccessPoint;
|
|||||||
import com.android.settingslib.wifi.WifiTracker;
|
import com.android.settingslib.wifi.WifiTracker;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link CustomSliceable} for Wi-Fi, used by generic clients.
|
* {@link CustomSliceable} for Wi-Fi, used by generic clients.
|
||||||
@@ -150,6 +153,7 @@ public class WifiSlice implements CustomSliceable {
|
|||||||
|
|
||||||
return new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
|
return new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
|
||||||
.setAccentColor(COLOR_NOT_TINTED)
|
.setAccentColor(COLOR_NOT_TINTED)
|
||||||
|
.setKeywords(getKeywords())
|
||||||
.addRow(new ListBuilder.RowBuilder()
|
.addRow(new ListBuilder.RowBuilder()
|
||||||
.setTitle(title)
|
.setTitle(title)
|
||||||
.setSubtitle(summary)
|
.setSubtitle(summary)
|
||||||
@@ -346,6 +350,14 @@ public class WifiSlice implements CustomSliceable {
|
|||||||
intent, 0 /* flags */);
|
intent, 0 /* flags */);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Set<String> getKeywords() {
|
||||||
|
final String keywords = mContext.getString(R.string.keywords_wifi);
|
||||||
|
return Arrays.asList(TextUtils.split(keywords, ","))
|
||||||
|
.stream()
|
||||||
|
.map(String::trim)
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Class getBackgroundWorkerClass() {
|
public Class getBackgroundWorkerClass() {
|
||||||
return WifiScanWorker.class;
|
return WifiScanWorker.class;
|
||||||
|
|||||||
Reference in New Issue
Block a user