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

Show Hotspot network icon (Wi-Fi Slice)

Browse Source 
- 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:
Weng Su
2023-08-24 11:54:05 +08:00
parent ef6ac74a15
commit c826558805
3 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,10 @@ package com.android.settings.wifi.slice;
import static android.app.slice.Slice.HINT_LIST_ITEM;
import static android.app.slice.SliceItem.FORMAT_SLICE;
import static android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.DEVICE_TYPE_PHONE;
import static com.android.settings.wifi.slice.WifiSlice.DEFAULT_EXPANDED_ROW_COUNT;
import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource;
import static com.google.common.truth.Truth.assertThat;
@@ -49,6 +51,7 @@ import com.android.settings.R;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.testutils.SliceTester;
import com.android.settings.testutils.shadow.ShadowWifiSlice;
import com.android.settings.wifi.WifiUtils;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectedState;
@@ -335,6 +338,27 @@ public class WifiSliceTest {
assertThat(wifiManager.getWifiState()).isEqualTo(WifiManager.WIFI_STATE_ENABLED);
}
@Test
public void getWifiIconResId_isInstantHotspotNetwork_returnHotspotIcon() {
WifiSliceItem wifiSliceItem = mock(WifiSliceItem.class);
when(wifiSliceItem.isInstantHotspotNetwork()).thenReturn(true);
when(wifiSliceItem.getInstantHotspotDeviceType()).thenReturn(DEVICE_TYPE_PHONE);
assertThat(mWifiSlice.getWifiIconResId(wifiSliceItem))
.isEqualTo(getHotspotIconResource(DEVICE_TYPE_PHONE));
}
@Test
public void getWifiIconResId_notInstantHotspotNetwork_returnInternetIcon() {
WifiSliceItem wifiSliceItem = mock(WifiSliceItem.class);
when(wifiSliceItem.isInstantHotspotNetwork()).thenReturn(false);
when(wifiSliceItem.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
when(wifiSliceItem.shouldShowXLevelIcon()).thenReturn(false);
assertThat(mWifiSlice.getWifiIconResId(wifiSliceItem))
.isEqualTo(WifiUtils.getInternetIconResource(WifiEntry.WIFI_LEVEL_MAX, false));
}
@Implements(SliceBackgroundWorker.class)
public static class ShadowSliceBackgroundWorker {
private static WifiScanWorker mWifiScanWorker = mock(WifiScanWorker.class);