Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d243cf50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15759395

Change-Id: I7c8cb44cc27287d2ad7fcb45940b95c6b02c9dfc
parents 516c7f2b ebd9d182
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -337,6 +337,9 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
    }

    Drawable getInternetWifiDrawable(@NonNull WifiEntry wifiEntry) {
        if (wifiEntry.getLevel() == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
            return null;
        }
        final Drawable drawable =
                mWifiIconInjector.getIcon(wifiEntry.shouldShowXLevelIcon(), wifiEntry.getLevel());
        if (drawable == null) {
+10 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
    }

    @Test
    public void getWifiDrawable_withConnectedEntry_returnIntentIconWithCorrectColor() {
    public void getInternetWifiDrawable_withConnectedEntry_returnIntentIconWithCorrectColor() {
        final Drawable drawable = mock(Drawable.class);
        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));
    }

    @Test
    public void getInternetWifiDrawable_withWifiLevelUnreachable_returnNull() {
        when(mConnectedEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE);

        Drawable drawable = mInternetDialogController.getInternetWifiDrawable(mConnectedEntry);

        assertThat(drawable).isNull();
    }

    @Test
    public void launchWifiNetworkDetailsSetting_withNoWifiEntryKey_doNothing() {
        mInternetDialogController.launchWifiNetworkDetailsSetting(null /* key */);