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

Unverified Commit 32ca6718 authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

Revert "fixup! SystemUI: Allow Wi-Fi/cell tiles to co-exist with provider model" 

This reverts commit 352200dda727eb3ae71504bc0c403471612013b1.

Change-Id: I42d38e32b1babb8045f8b8567d2cadcd2d2d7a60
parent 8acab11a

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java

+3 −3
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class CastTileTest extends SysuiTestCase { 
        WifiIndicators indicators = new WifiIndicators(

                false, mock(IconState.class),

                qsIcon, false, false, "",

                false, "", true);

                false, "");

        mSignalCallback.setWifiIndicators(indicators);

        mTestableLooper.processAllMessages();
@@ -152,7 +152,7 @@ public class CastTileTest extends SysuiTestCase { 
        WifiIndicators indicators = new WifiIndicators(

                true, mock(IconState.class),

                qsIcon, false, false, "",

                false, "", true);

                false, "");

        mSignalCallback.setWifiIndicators(indicators);

        mTestableLooper.processAllMessages();
@@ -164,7 +164,7 @@ public class CastTileTest extends SysuiTestCase { 
        WifiIndicators indicators = new WifiIndicators(

                true, mock(IconState.class),

                qsIcon, false, false, "",

                false, "", true);

                false, "");

        mSignalCallback.setWifiIndicators(indicators);

        mTestableLooper.processAllMessages();

    }

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java

+1 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ public class InternetTileTest extends SysuiTestCase { 
            /* activityOut= */ false,

            /* description= */ null,

            /* isTransient= */ false,

            /* statusLabel= */ null,

            /* isDefault= */ true

            /* statusLabel= */ null

        );

        mTile.mSignalCallback.setWifiIndicators(wifiIndicators);

        IconState state = new IconState(true, 0, "");

packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class ShadeCarrierGroupControllerTest extends LeakCheckedTest { 
        MobileDataIndicators indicators = new MobileDataIndicators(

                mock(IconState.class),

                mock(IconState.class),

                0, 0, true, true, "", "", "", 0, true, true, true);

                0, 0, true, true, "", "", "", 0, true, true);

        mSignalCallback.setMobileDataIndicators(indicators);

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class CallbackHandlerTest extends SysuiTestCase { 
        String description = "Test";

        String secondaryLabel = "Secondary label";

        WifiIndicators indicators = new WifiIndicators(

                enabled, status, qs, in, out, description, true, secondaryLabel, true);

                enabled, status, qs, in, out, description, true, secondaryLabel);

        mHandler.setWifiIndicators(indicators);

        waitForCallbacks();
@@ -120,7 +120,7 @@ public class CallbackHandlerTest extends SysuiTestCase { 
        boolean roaming = true;

        MobileDataIndicators indicators = new MobileDataIndicators(

                status, qs, type, qsType, in, out, typeDescription,

                typeDescriptionHtml, description, subId, roaming, true, true);

                typeDescriptionHtml, description, subId, roaming, true);

        mHandler.setMobileDataIndicators(indicators);

        waitForCallbacks();