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

Commit 4a4c22dc authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "[kairos] names everywhere for debugging" into main

parents 967766f3 5668858f

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

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalDisplayCutout 
import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadius

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.kairos.ExperimentalKairosApi

import com.android.systemui.kairos.util.nameTag

import com.android.systemui.privacy.OngoingPrivacyChip

import com.android.systemui.res.R

import com.android.systemui.scene.shared.model.DualShadeEducationElement
@@ -636,6 +637,7 @@ private fun ShadeCarrierGroupKairos( 
        ActivatedKairosSpec(

            buildSpec = viewModel.mobileIconsViewModelKairos.get().composeWrapper(),

            kairosNetwork = viewModel.kairosNetwork,

            name = nameTag("ShadeCarrierGroupKairos"),

        ) { iconsViewModel: MobileIconsViewModelKairosComposeWrapper ->

            for ((subId, icon) in iconsViewModel.icons) {

                Spacer(modifier = Modifier.width(5.dp))

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairosAdapterTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class MobileIconInteractorKairosAdapterTest : MobileIconInteractorTestBase() { 
            activeDataConnectionHasDataEnabled =

                interactor.activeDataConnectionHasDataEnabled.toState(),

            activeDataIconInteractor =

                interactor.activeDataIconInteractor.toState().mapLatestBuild {

                interactor.activeDataIconInteractor.toState().mapLatestBuild() {

                    it?.let { wrap(it) }

                },

            alwaysShowDataRatIcon = interactor.alwaysShowDataRatIcon.toState(),

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelKairosTest.kt

+1 −7
Original line number Diff line number Diff line
@@ -58,13 +58,7 @@ import org.mockito.kotlin.mock 
class LocationBasedMobileIconViewModelKairosTest : SysuiTestCase() {



    private val Kosmos.commonImpl: MobileIconViewModelKairosCommon by ActivatedKairosFixture {

        MobileIconViewModelKairos(

            SUB_1_ID,

            interactor,

            airplaneModeInteractor,

            constants,

            featureFlagsClassic,

        )

        MobileIconViewModelKairos(SUB_1_ID, interactor, airplaneModeInteractor, constants)

    }



    private val Kosmos.homeIcon: HomeMobileIconViewModelKairos by

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelKairosTest.kt

+1 −7
Original line number Diff line number Diff line
@@ -81,13 +81,7 @@ import org.mockito.kotlin.stub 
class MobileIconViewModelKairosTest : SysuiTestCase() {



    private val Kosmos.underTest: MobileIconViewModelKairos by ActivatedKairosFixture {

        MobileIconViewModelKairos(

            SUB_1_ID,

            interactor,

            airplaneModeInteractor,

            constants,

            featureFlagsClassic,

        )

        MobileIconViewModelKairos(SUB_1_ID, interactor, airplaneModeInteractor, constants)

    }

    private val Kosmos.interactor: MobileIconInteractorKairos by ActivatedKairosFixture {

        MobileIconInteractorKairosImpl(

packages/SystemUI/src/com/android/systemui/KairosActivatable.kt

+8 −5
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ import com.android.systemui.kairos.RootKairosNetwork 
import com.android.systemui.kairos.State

import com.android.systemui.kairos.StateLoop

import com.android.systemui.kairos.TransactionScope

import com.android.systemui.kairos.activateSpec

import com.android.systemui.kairos.effect

import com.android.systemui.kairos.launchKairosNetwork

import com.android.systemui.kairos.util.NameTag

import com.android.systemui.kairos.util.nameTag

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey
@@ -194,18 +195,20 @@ private constructor( 


    override fun start() {

        appScope.launch {

            unwrappedNetwork.activateSpec {

            unwrappedNetwork.activateSpec(nameTag("KairosCoreStartable")) {

                for (activatable in activatables.get()) {

                    activatable.run { activate() }

                }

                effect { started.complete(Unit) }

                effect(name = nameTag("KairosCoreStartable::notifyStarted")) {

                    started.complete(Unit)

                }

            }

        }

    }



    override suspend fun activateSpec(spec: BuildSpec<*>) {

    override suspend fun activateSpec(name: NameTag?, spec: BuildSpec<*>) {

        started.await()

        unwrappedNetwork.activateSpec(spec)

        unwrappedNetwork.activateSpec(name, spec)

    }



    override suspend fun <R> transact(block: TransactionScope.() -> R): R {