Show Hotspot network icon (Wi-Fi Slice)
- Show Hotspot device type icons without signal strength (no Wi-Fi level) Bug: 268550769 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest Change-Id: I2a707cf20fc1a6d519ef5ca54db64e913daec969
This commit is contained in:
@@ -20,6 +20,7 @@ import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
|
||||
import static android.provider.SettingsSlicesContract.KEY_WIFI;
|
||||
|
||||
import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI;
|
||||
import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource;
|
||||
|
||||
import android.annotation.ColorInt;
|
||||
import android.app.PendingIntent;
|
||||
@@ -264,13 +265,19 @@ public class WifiSlice implements CustomSliceable {
|
||||
android.R.attr.colorControlNormal));
|
||||
}
|
||||
|
||||
final Drawable drawable = mContext.getDrawable(
|
||||
WifiUtils.getInternetIconResource(wifiSliceItem.getLevel(),
|
||||
wifiSliceItem.shouldShowXLevelIcon()));
|
||||
Drawable drawable = mContext.getDrawable(getWifiIconResId(wifiSliceItem));
|
||||
drawable.setTint(tint);
|
||||
return Utils.createIconWithDrawable(drawable);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
int getWifiIconResId(WifiSliceItem wifiSliceItem) {
|
||||
return (wifiSliceItem.isInstantHotspotNetwork())
|
||||
? getHotspotIconResource(wifiSliceItem.getInstantHotspotDeviceType())
|
||||
: WifiUtils.getInternetIconResource(wifiSliceItem.getLevel(),
|
||||
wifiSliceItem.shouldShowXLevelIcon());
|
||||
}
|
||||
|
||||
protected IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
|
||||
if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
|
||||
return IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp);
|
||||
|
Reference in New Issue
Block a user