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

Unverified Commit 4aa4a602 authored by Danny Lin's avatar Danny Lin Committed by Michael Bestas
Browse files

Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" 



This reverts commit 8bb51489.

We've intentionally enabled and fixed the Wi-Fi and cellular data tiles
to work with the provider model, so revert this to fix the dedicated
network tiles.

Signed-off-by: default avatarDanny Lin <danny@kdrag0n.dev>
Change-Id: I1c74e0426a2660c07cd8cc59ff22eb45bcdc4dda
parent 4519bace

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

+0 −14
Original line number Diff line number Diff line
@@ -596,20 +596,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P 
                }

            }

        }



        if (!tiles.contains("internet")) {

            if (tiles.contains("wifi")) {

                // Replace the WiFi with Internet, and remove the Cell

                tiles.set(tiles.indexOf("wifi"), "internet");

                tiles.remove("cell");

            } else if (tiles.contains("cell")) {

                // Replace the Cell with Internet

                tiles.set(tiles.indexOf("cell"), "internet");

            }

        } else {

            tiles.remove("wifi");

            tiles.remove("cell");

        }

        return tiles;

    }

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+0 −2
Original line number Diff line number Diff line
@@ -119,8 +119,6 @@ public class TileQueryHelper { 
        }



        final ArrayList<QSTile> tilesToAdd = new ArrayList<>();

        possibleTiles.remove("cell");

        possibleTiles.remove("wifi");



        for (String spec : possibleTiles) {

            // Only add current and stock tiles that can be created from QSFactoryImpl.

packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java

+0 −44
Original line number Diff line number Diff line
@@ -238,50 +238,6 @@ public class QSTileHostTest extends SysuiTestCase { 
        assertEquals(2, mQSTileHost.getTiles().size());

    }



    @Test

    public void testRemoveWifiAndCellularWithoutInternet() {

        saveSetting("wifi, spec1, cell, spec2");



        assertEquals("internet", mQSTileHost.getSpecs().get(0));

        assertEquals("spec1", mQSTileHost.getSpecs().get(1));

        assertEquals("spec2", mQSTileHost.getSpecs().get(2));

    }



    @Test

    public void testRemoveWifiAndCellularWithInternet() {

        saveSetting("wifi, spec1, cell, spec2, internet");



        assertEquals("spec1", mQSTileHost.getSpecs().get(0));

        assertEquals("spec2", mQSTileHost.getSpecs().get(1));

        assertEquals("internet", mQSTileHost.getSpecs().get(2));

    }



    @Test

    public void testRemoveWifiWithoutInternet() {

        saveSetting("spec1, wifi, spec2");



        assertEquals("spec1", mQSTileHost.getSpecs().get(0));

        assertEquals("internet", mQSTileHost.getSpecs().get(1));

        assertEquals("spec2", mQSTileHost.getSpecs().get(2));

    }



    @Test

    public void testRemoveCellWithInternet() {

        saveSetting("spec1, spec2, cell, internet");



        assertEquals("spec1", mQSTileHost.getSpecs().get(0));

        assertEquals("spec2", mQSTileHost.getSpecs().get(1));

        assertEquals("internet", mQSTileHost.getSpecs().get(2));

    }



    @Test

    public void testNoWifiNoCellularNoInternet() {

        saveSetting("spec1,spec2");



        assertEquals("spec1", mQSTileHost.getSpecs().get(0));

        assertEquals("spec2", mQSTileHost.getSpecs().get(1));

    }



    @Test

    public void testSpecWithInvalidDoesNotUseDefault() {

        mContext.getOrCreateTestableResources()