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

Commit 55452984 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Disables CommunalDreamStartable when flexi is on" into main

parents 2f3581b9 ef0ec327

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/CommunalDreamStartableTest.kt

+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()

packages/SystemUI/src/com/android/systemui/communal/CommunalDreamStartable.kt

+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

        }