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

Commit b09f6d57 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Remove old InternetTile.java. 

InternetTileNewImpl is its replacement and it's been launched for years,
so we can remove the old implementation.

Bug: 291315866
Flag: EXEMPT removing launched code
Test: manual: Verify Internet tile still works
Test: atest QSFactoryImplTest
Change-Id: Ie54c08a4e9ba7883dc34ca60706ccc886a5a6c6c
parent 5d9ea46c

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSFactoryImplTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.qs.tiles.DreamTile 
import com.android.systemui.qs.tiles.FlashlightTile

import com.android.systemui.qs.tiles.FontScalingTile

import com.android.systemui.qs.tiles.HotspotTile

import com.android.systemui.qs.tiles.InternetTile

import com.android.systemui.qs.tiles.InternetTileNewImpl

import com.android.systemui.qs.tiles.LocationTile

import com.android.systemui.qs.tiles.MicrophoneToggleTile

import com.android.systemui.qs.tiles.ModesTile
@@ -64,7 +64,7 @@ import org.mockito.MockitoAnnotations 


private val specMap =

    mapOf(

        "internet" to InternetTile::class.java,

        "internet" to InternetTileNewImpl::class.java,

        "bt" to BluetoothTile::class.java,

        "dnd" to ModesTile::class.java,

        "inversion" to ColorInversionTile::class.java,
@@ -102,7 +102,7 @@ class QSFactoryImplTest : SysuiTestCase() { 
    @Mock private lateinit var customTileFactory: CustomTile.Factory

    @Mock private lateinit var customTile: CustomTile



    @Mock private lateinit var internetTile: InternetTile

    @Mock private lateinit var internetTile: InternetTileNewImpl

    @Mock private lateinit var bluetoothTile: BluetoothTile

    @Mock private lateinit var modesTile: ModesTile

    @Mock private lateinit var colorInversionTile: ColorInversionTile

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

deleted100644 → 0
+0 −225
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.qs.tiles;



import static android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.os.Handler;

import android.platform.test.flag.junit.FlagsParameterization;

import android.service.quicksettings.Tile;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.classifier.FalsingManagerFake;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.QsEventLogger;

import com.android.systemui.qs.flags.QSComposeFragment;

import com.android.systemui.qs.flags.QsInCompose;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.qs.tiles.dialog.InternetDialogManager;

import com.android.systemui.qs.tiles.dialog.WifiStateWorker;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.connectivity.AccessPointController;

import com.android.systemui.statusbar.connectivity.IconState;

import com.android.systemui.statusbar.connectivity.NetworkController;

import com.android.systemui.statusbar.connectivity.WifiIndicators;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



import java.util.List;



@RunWith(ParameterizedAndroidJunit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

public class InternetTileTest extends SysuiTestCase {



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return allCombinationsOf(QSComposeFragment.FLAG_NAME);

    }



    @Mock

    private QSHost mHost;

    @Mock

    private NetworkController mNetworkController;

    @Mock

    private AccessPointController mAccessPointController;

    @Mock

    private InternetDialogManager mInternetDialogManager;

    @Mock

    private WifiStateWorker mWifiStateWorker;

    @Mock

    private QsEventLogger mUiEventLogger;



    private TestableLooper mTestableLooper;

    private InternetTile mTile;



    public InternetTileTest(FlagsParameterization flags) {

        super();

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        mTestableLooper = TestableLooper.get(this);

        when(mHost.getContext()).thenReturn(mContext);

        when(mHost.getUserContext()).thenReturn(mContext);



        mTile = new InternetTile(

            mHost,

            mUiEventLogger,

            mTestableLooper.getLooper(),

            new Handler(mTestableLooper.getLooper()),

            new FalsingManagerFake(),

            mock(MetricsLogger.class),

            mock(StatusBarStateController.class),

            mock(ActivityStarter.class),

            mock(QSLogger.class),

            mNetworkController,

            mAccessPointController,

            mInternetDialogManager,

            mWifiStateWorker

        );



        mTile.initialize();

        mTestableLooper.processAllMessages();

    }



    @After

    public void tearDown() {

        mTile.destroy();

        mTestableLooper.processAllMessages();

    }



    @Test

    public void setConnectivityStatus_defaultNetworkNotExists_updateTile() {

        mTile.mSignalCallback.setConnectivityStatus(

            /* noDefaultNetwork= */ true,

            /* noValidatedNetwork= */ true,

            /* noNetworksAvailable= */ true);

        mTestableLooper.processAllMessages();

        assertThat(String.valueOf(mTile.getState().secondaryLabel))

            .isEqualTo(mContext.getString(R.string.quick_settings_networks_unavailable));

        assertThat(mTile.getLastTileState()).isEqualTo(1);

    }



    @Test

    public void setConnectivityStatus_defaultNetworkExists_notUpdateTile() {

        mTile.mSignalCallback.setConnectivityStatus(

            /* noDefaultNetwork= */ false,

            /* noValidatedNetwork= */ true,

            /* noNetworksAvailable= */ true);

        mTestableLooper.processAllMessages();

        assertThat(String.valueOf(mTile.getState().secondaryLabel))

            .isNotEqualTo(mContext.getString(R.string.quick_settings_networks_unavailable));

        assertThat(String.valueOf(mTile.getState().secondaryLabel))

            .isNotEqualTo(mContext.getString(R.string.quick_settings_networks_available));

        assertThat(mTile.getLastTileState()).isEqualTo(-1);

    }



    @Test

    public void setIsAirplaneMode_APM_enabled_wifi_disabled() {

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

        mTile.mSignalCallback.setIsAirplaneMode(state);

        mTestableLooper.processAllMessages();

        assertThat(mTile.getState().state).isEqualTo(Tile.STATE_INACTIVE);

        assertThat(mTile.getState().secondaryLabel)

            .isEqualTo(mContext.getString(R.string.status_bar_airplane));

    }



    @Test

    public void setIsAirplaneMode_APM_enabled_wifi_enabled() {

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

        mTile.mSignalCallback.setIsAirplaneMode(state);

        mTestableLooper.processAllMessages();

        assertThat(mTile.getState().state).isEqualTo(Tile.STATE_ACTIVE);

        assertThat(mTile.getState().secondaryLabel)

            .isNotEqualTo(mContext.getString(R.string.status_bar_airplane));

    }



    @Test

    public void setIsAirplaneMode_APM_enabled_after_wifi_disconnected() {

        WifiIndicators wifiIndicators = new WifiIndicators(

            /* enabled= */ true,

            /* statusIcon= */ null,

            /* qsIcon= */ null,

            /* activityIn= */ false,

            /* activityOut= */ false,

            /* description= */ null,

            /* isTransient= */ false,

            /* statusLabel= */ null

        );

        mTile.mSignalCallback.setWifiIndicators(wifiIndicators);

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

        mTile.mSignalCallback.setIsAirplaneMode(state);

        mTestableLooper.processAllMessages();

        assertThat(mTile.getState().icon).isEqualTo(

                createExpectedIcon(R.drawable.ic_qs_no_internet_unavailable));

    }



    @Test

    public void secondaryClick_turnsWifiOff() {

        when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);



        mTile.secondaryClick(null);

        mTestableLooper.processAllMessages();



        verify(mWifiStateWorker, times(1)).setWifiEnabled(eq(false));

    }



    @Test

    public void secondaryClick_turnsWifiOn() {

        when(mWifiStateWorker.isWifiEnabled()).thenReturn(false);



        mTile.secondaryClick(null);

        mTestableLooper.processAllMessages();



        verify(mWifiStateWorker, times(1)).setWifiEnabled(eq(true));

    }



    private QSTile.Icon createExpectedIcon(int resId) {

        if (QsInCompose.isEnabled()) {

            return new QSTileImpl.DrawableIconWithRes(mContext.getDrawable(resId), resId);

        } else {

            return QSTileImpl.ResourceIcon.get(resId);

        }

    }

}

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java

deleted100644 → 0
+0 −711

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ constructor( 
    override fun getLongClickIntent(): Intent = WIFI_SETTINGS



    companion object {

        const val TILE_SPEC: String = "internet"



        private val WIFI_SETTINGS = Intent(Settings.ACTION_WIFI_SETTINGS)

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/ConnectivityModule.kt

+6 −18
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.statusbar.connectivity 


import android.os.UserManager

import com.android.systemui.bluetooth.qsdialog.dagger.AudioSharingModule

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags.SIGNAL_CALLBACK_DEPRECATION

import com.android.systemui.qs.QsEventLogger

import com.android.systemui.qs.flags.QsInCompose

import com.android.systemui.qs.pipeline.shared.TileSpec
@@ -30,7 +28,6 @@ import com.android.systemui.qs.tiles.BluetoothTile 
import com.android.systemui.qs.tiles.CastTile

import com.android.systemui.qs.tiles.DataSaverTile

import com.android.systemui.qs.tiles.HotspotTile

import com.android.systemui.qs.tiles.InternetTile

import com.android.systemui.qs.tiles.InternetTileNewImpl

import com.android.systemui.qs.tiles.MobileDataTile

import com.android.systemui.qs.tiles.NfcTile
@@ -114,6 +111,12 @@ interface ConnectivityModule { 
    /** Inject NfcTile into tileMap in QSModule */

    @Binds @IntoMap @StringKey(NfcTile.TILE_SPEC) fun bindNfcTile(nfcTile: NfcTile): QSTileImpl<*>



    /** Inject InternetTileNewImpl into tileMap in QSModule */

    @Binds

    @IntoMap

    @StringKey(InternetTileNewImpl.TILE_SPEC)

    fun bindInternetTile(newInternetTile: InternetTileNewImpl): QSTileImpl<*>



    @Binds

    @IntoMap

    @StringKey(AIRPLANE_MODE_TILE_SPEC)
@@ -160,21 +163,6 @@ interface ConnectivityModule { 
        const val CAST_TILE_SPEC = "cast"

        const val BLUETOOTH_TILE_SPEC = "bt"



        /** Inject InternetTile or InternetTileNewImpl into tileMap in QSModule */

        @Provides

        @IntoMap

        @StringKey(InternetTile.TILE_SPEC)

        fun bindInternetTile(

            internetTile: InternetTile,

            newInternetTile: InternetTileNewImpl,

            featureFlags: FeatureFlags,

        ): QSTileImpl<*> =

            if (featureFlags.isEnabled(SIGNAL_CALLBACK_DEPRECATION)) {

                newInternetTile

            } else {

                internetTile

            }



        @Provides

        @IntoMap

        @StringKey(AIRPLANE_MODE_TILE_SPEC)