Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Don't show Wi-Fi icon if the level is -1" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-07 16:11:13 +00:00
committed by Android (Google) Code Review
parent 67bd92262c 8447f1a19e
commit ebd9d182d0
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
View File

@@ -337,6 +337,9 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
} }
Drawable getInternetWifiDrawable(@NonNull WifiEntry wifiEntry) { Drawable getInternetWifiDrawable(@NonNull WifiEntry wifiEntry) {
if (wifiEntry.getLevel() == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
return null;
}
final Drawable drawable = final Drawable drawable =
mWifiIconInjector.getIcon(wifiEntry.shouldShowXLevelIcon(), wifiEntry.getLevel()); mWifiIconInjector.getIcon(wifiEntry.shouldShowXLevelIcon(), wifiEntry.getLevel());
if (drawable == null) { if (drawable == null) {

11
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java
View File

@@ -259,7 +259,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
} }
@Test @Test
public void getWifiDrawable_withConnectedEntry_returnIntentIconWithCorrectColor() { public void getInternetWifiDrawable_withConnectedEntry_returnIntentIconWithCorrectColor() {
final Drawable drawable = mock(Drawable.class); final Drawable drawable = mock(Drawable.class);
when(mWifiIconInjector.getIcon(anyBoolean(), anyInt())).thenReturn(drawable); when(mWifiIconInjector.getIcon(anyBoolean(), anyInt())).thenReturn(drawable);
@@ -269,6 +269,15 @@ public class InternetDialogControllerTest extends SysuiTestCase {
verify(drawable).setTint(mContext.getColor(R.color.connected_network_primary_color)); verify(drawable).setTint(mContext.getColor(R.color.connected_network_primary_color));
} }
@Test
public void getInternetWifiDrawable_withWifiLevelUnreachable_returnNull() {
when(mConnectedEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE);
Drawable drawable = mInternetDialogController.getInternetWifiDrawable(mConnectedEntry);
assertThat(drawable).isNull();
}
@Test @Test
public void launchWifiNetworkDetailsSetting_withNoWifiEntryKey_doNothing() { public void launchWifiNetworkDetailsSetting_withNoWifiEntryKey_doNothing() {
mInternetDialogController.launchWifiNetworkDetailsSetting(null /* key */); mInternetDialogController.launchWifiNetworkDetailsSetting(null /* key */);