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

Commit ef0ec327 authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[flexiglass] Disables CommunalDreamStartable when flexi is on

Also makes its test only run with flexi off

Bug: 283121968
Test: N/A
Flag: com.android.systemui.scene_container
Change-Id: Ic2adf8567ac51ca4c5d42e1a3bff695c0093a192
parent fedfbed5
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.SysuiTestCase
import com.android.systemui.communal.domain.interactor.communalSceneInteractor
import com.android.systemui.communal.domain.interactor.communalSettingsInteractor
import com.android.systemui.communal.domain.interactor.setCommunalV2Enabled
import com.android.systemui.flags.DisableSceneContainer
import com.android.systemui.flags.Flags.COMMUNAL_SERVICE_ENABLED
import com.android.systemui.flags.fakeFeatureFlagsClassic
import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository
@@ -55,6 +56,7 @@ import platform.test.runner.parameterized.Parameters

@SmallTest
@EnableFlags(Flags.FLAG_COMMUNAL_HUB)
@DisableSceneContainer
@RunWith(ParameterizedAndroidJunit4::class)
class CommunalDreamStartableTest(flags: FlagsParameterization) : SysuiTestCase() {
    private val kosmos = testKosmos()
+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState
import com.android.systemui.keyguard.shared.model.TransitionState
import com.android.systemui.keyguard.shared.model.filterState
import com.android.systemui.power.domain.interactor.PowerInteractor
import com.android.systemui.scene.shared.flag.SceneContainerFlag
import com.android.systemui.scene.shared.model.Scenes
import com.android.systemui.util.kotlin.BooleanFlowOperators.allOf
import com.android.systemui.util.kotlin.BooleanFlowOperators.not
@@ -77,7 +78,7 @@ constructor(

    @SuppressLint("MissingPermission")
    override fun start() {
        if (!communalSettingsInteractor.isCommunalFlagEnabled()) {
        if (!communalSettingsInteractor.isCommunalFlagEnabled() || SceneContainerFlag.isEnabled) {
            return
        }