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

Commit 26c0338e authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge changes I14dbccfe,Ife90d8bc into main 

* changes:
  [flexiglass] Add onClick handling to ShadeCarrierGroup
  Convert ShadeHeaderViewModel to Kosmos
parents ebb7133f 295b5234

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+10 −9
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ private fun ShadeCarrierGroup( 
                                    StatusBarLocation.SHADE_CARRIER_GROUP

                                ) as ShadeCarrierGroupMobileIconViewModel),

                        )

                        .also { it.setOnClickListener { viewModel.onShadeCarrierGroupClicked() } }

                },

            )

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt

+4 −43
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import com.android.compose.animation.scene.SwipeDirection 
import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.FakeFeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.kosmos.testScope

import com.android.systemui.qs.FooterActionsController

import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel
@@ -34,18 +34,8 @@ import com.android.systemui.res.R 
import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.settings.brightness.ui.viewmodel.brightnessMirrorViewModel

import com.android.systemui.shade.domain.interactor.privacyChipInteractor

import com.android.systemui.shade.domain.interactor.shadeHeaderClockInteractor

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel

import com.android.systemui.shade.ui.viewmodel.shadeHeaderViewModel

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor

import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock
@@ -64,8 +54,6 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { 


    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val mobileIconsInteractor = FakeMobileIconsInteractor(FakeMobileMappingsProxy(), mock())

    private val flags = FakeFeatureFlagsClassic().also { it.set(Flags.NEW_NETWORK_SLICE_UI, false) }

    private val qsFlexiglassAdapter = FakeQSSceneAdapter({ mock() })

    private val footerActionsViewModel = mock<FooterActionsViewModel>()

    private val footerActionsViewModelFactory =
@@ -74,45 +62,18 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { 
        }

    private val footerActionsController = mock<FooterActionsController>()



    private var mobileIconsViewModel: MobileIconsViewModel =

        MobileIconsViewModel(

            logger = mock(),

            verboseLogger = mock(),

            interactor = mobileIconsInteractor,

            airplaneModeInteractor =

                AirplaneModeInteractor(

                    FakeAirplaneModeRepository(),

                    FakeConnectivityRepository(),

                    FakeMobileConnectionsRepository(),

                ),

            constants = mock(),

            flags,

            scope = testScope.backgroundScope,

        )

    private val sceneInteractor = kosmos.sceneInteractor



    private lateinit var shadeHeaderViewModel: ShadeHeaderViewModel



    private lateinit var underTest: QuickSettingsSceneViewModel



    @Before

    fun setUp() {

        shadeHeaderViewModel =

            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

                clockInteractor = kosmos.shadeHeaderClockInteractor,

                broadcastDispatcher = fakeBroadcastDispatcher,

            )

        kosmos.fakeFeatureFlagsClassic.set(Flags.NEW_NETWORK_SLICE_UI, false)



        underTest =

            QuickSettingsSceneViewModel(

                brightnessMirrorViewModel = kosmos.brightnessMirrorViewModel,

                shadeHeaderViewModel = shadeHeaderViewModel,

                shadeHeaderViewModel = kosmos.shadeHeaderViewModel,

                qsSceneAdapter = qsFlexiglassAdapter,

                notifications = kosmos.notificationsPlaceholderViewModel,

                footerActionsViewModelFactory = footerActionsViewModelFactory,

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+2 −41
Original line number Diff line number Diff line
@@ -75,21 +75,13 @@ import com.android.systemui.scene.shared.model.fakeSceneDataSource 
import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel

import com.android.systemui.settings.FakeDisplayTracker

import com.android.systemui.settings.brightness.ui.viewmodel.brightnessMirrorViewModel

import com.android.systemui.shade.domain.interactor.privacyChipInteractor

import com.android.systemui.shade.domain.interactor.shadeHeaderClockInteractor

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel

import com.android.systemui.shade.ui.viewmodel.ShadeSceneViewModel

import com.android.systemui.shade.ui.viewmodel.shadeHeaderViewModel

import com.android.systemui.statusbar.notification.stack.domain.interactor.headsUpNotificationInteractor

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor

import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.statusbar.policy.domain.interactor.deviceProvisioningInteractor

import com.android.systemui.telephony.data.repository.fakeTelephonyRepository

import com.android.systemui.testKosmos
@@ -180,25 +172,6 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { 
        )

    }



    private val mobileIconsInteractor = FakeMobileIconsInteractor(FakeMobileMappingsProxy(), mock())



    private var mobileIconsViewModel: MobileIconsViewModel =

        MobileIconsViewModel(

            logger = mock(),

            verboseLogger = mock(),

            interactor = mobileIconsInteractor,

            airplaneModeInteractor =

                AirplaneModeInteractor(

                    FakeAirplaneModeRepository(),

                    FakeConnectivityRepository(),

                    FakeMobileConnectionsRepository(),

                ),

            constants = mock(),

            flags = kosmos.fakeFeatureFlagsClassic,

            scope = testScope.backgroundScope,

        )



    private lateinit var shadeHeaderViewModel: ShadeHeaderViewModel

    private lateinit var shadeSceneViewModel: ShadeSceneViewModel



    private val keyguardInteractor by lazy { kosmos.keyguardInteractor }
@@ -241,23 +214,11 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { 
        bouncerActionButtonInteractor = kosmos.bouncerActionButtonInteractor

        bouncerViewModel = kosmos.bouncerViewModel



        shadeHeaderViewModel =

            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

                clockInteractor = kosmos.shadeHeaderClockInteractor,

                broadcastDispatcher = fakeBroadcastDispatcher,

            )



        shadeSceneViewModel =

            ShadeSceneViewModel(

                applicationScope = testScope.backgroundScope,

                deviceEntryInteractor = deviceEntryInteractor,

                shadeHeaderViewModel = shadeHeaderViewModel,

                shadeHeaderViewModel = kosmos.shadeHeaderViewModel,

                qsSceneAdapter = qsFlexiglassAdapter,

                notifications = kosmos.notificationsPlaceholderViewModel,

                brightnessMirrorViewModel = kosmos.brightnessMirrorViewModel,

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeHeaderViewModelTest.kt

+17 −45
Original line number Diff line number Diff line
@@ -2,29 +2,18 @@ package com.android.systemui.shade.ui.viewmodel 


import android.content.Intent

import android.provider.AlarmClock

import android.provider.Settings

import android.telephony.SubscriptionManager.PROFILE_CLASS_UNSET

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.FakeFeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.kosmos.testScope

import com.android.systemui.plugins.activityStarter

import com.android.systemui.shade.domain.interactor.privacyChipInteractor

import com.android.systemui.shade.domain.interactor.shadeHeaderClockInteractor

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor

import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.fakeMobileIconsInteractor

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.argThat

import com.android.systemui.util.mockito.mock

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

import kotlinx.coroutines.test.runTest

import org.junit.Before
@@ -40,43 +29,13 @@ import org.mockito.MockitoAnnotations 
class ShadeHeaderViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val mobileIconsInteractor = kosmos.fakeMobileIconsInteractor



    private val mobileIconsInteractor = FakeMobileIconsInteractor(FakeMobileMappingsProxy(), mock())

    private val flags = FakeFeatureFlagsClassic().also { it.set(Flags.NEW_NETWORK_SLICE_UI, false) }



    private var mobileIconsViewModel: MobileIconsViewModel =

        MobileIconsViewModel(

            logger = mock(),

            verboseLogger = mock(),

            interactor = mobileIconsInteractor,

            airplaneModeInteractor =

                AirplaneModeInteractor(

                    FakeAirplaneModeRepository(),

                    FakeConnectivityRepository(),

                    FakeMobileConnectionsRepository(),

                ),

            constants = mock(),

            flags,

            scope = testScope.backgroundScope,

        )



    private lateinit var underTest: ShadeHeaderViewModel

    private val underTest: ShadeHeaderViewModel = kosmos.shadeHeaderViewModel



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)



        underTest =

            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

                clockInteractor = kosmos.shadeHeaderClockInteractor,

                broadcastDispatcher = fakeBroadcastDispatcher,

            )

    }



    @Test
@@ -105,6 +64,19 @@ class ShadeHeaderViewModelTest : SysuiTestCase() { 
                )

        }



    @Test

    fun onShadeCarrierGroupClicked_launchesNetworkSettings() =

        testScope.runTest {

            val activityStarter = kosmos.activityStarter

            underTest.onShadeCarrierGroupClicked()



            verify(activityStarter)

                .postStartActivityDismissingKeyguard(

                    argThat(IntentMatcherAction(Settings.ACTION_WIRELESS_SETTINGS)),

                    anyInt(),

                )

        }



    companion object {

        private val SUB_1 =

            SubscriptionModel(

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt

+1 −44
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import com.android.systemui.authentication.shared.model.AuthenticationMethodMode 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.flags.FakeFeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus

import com.android.systemui.kosmos.testScope
@@ -41,19 +39,10 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor 
import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.settings.brightness.ui.viewmodel.brightnessMirrorViewModel

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.shade.domain.interactor.privacyChipInteractor

import com.android.systemui.shade.domain.interactor.shadeHeaderClockInteractor

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.shade.domain.startable.shadeStartable

import com.android.systemui.shade.shared.model.ShadeMode

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.FakeMobileIconsInteractor

import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever
@@ -79,29 +68,8 @@ class ShadeSceneViewModelTest : SysuiTestCase() { 
    private val deviceEntryInteractor by lazy { kosmos.deviceEntryInteractor }

    private val shadeRepository by lazy { kosmos.shadeRepository }



    private val mobileIconsInteractor = FakeMobileIconsInteractor(FakeMobileMappingsProxy(), mock())

    private val flags = FakeFeatureFlagsClassic().also { it.set(Flags.NEW_NETWORK_SLICE_UI, false) }



    private var mobileIconsViewModel: MobileIconsViewModel =

        MobileIconsViewModel(

            logger = mock(),

            verboseLogger = mock(),

            interactor = mobileIconsInteractor,

            airplaneModeInteractor =

                AirplaneModeInteractor(

                    FakeAirplaneModeRepository(),

                    FakeConnectivityRepository(),

                    FakeMobileConnectionsRepository(),

                ),

            constants = mock(),

            flags,

            scope = testScope.backgroundScope,

        )



    private val qsSceneAdapter = FakeQSSceneAdapter({ mock() })



    private lateinit var shadeHeaderViewModel: ShadeHeaderViewModel



    private lateinit var underTest: ShadeSceneViewModel



    @Mock private lateinit var mediaDataManager: MediaDataManager
@@ -109,23 +77,12 @@ class ShadeSceneViewModelTest : SysuiTestCase() { 
    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        shadeHeaderViewModel =

            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

                clockInteractor = kosmos.shadeHeaderClockInteractor,

                broadcastDispatcher = fakeBroadcastDispatcher,

            )



        underTest =

            ShadeSceneViewModel(

                applicationScope = testScope.backgroundScope,

                deviceEntryInteractor = deviceEntryInteractor,

                shadeHeaderViewModel = shadeHeaderViewModel,

                shadeHeaderViewModel = kosmos.shadeHeaderViewModel,

                qsSceneAdapter = qsSceneAdapter,

                notifications = kosmos.notificationsPlaceholderViewModel,

                brightnessMirrorViewModel = kosmos.brightnessMirrorViewModel,