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

Commit 8bd347b5 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

SceneContainer now depends on ComposeLockscreen 

Test: run flexi; run without flexi
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Id122a230538f6ba2acd79880fd4681bdaa0d9b10
parent 5011d41f

packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.Flags.SCENE_CONTAINER_ENABLED

import com.android.systemui.flags.RefactorFlagUtils

import com.android.systemui.keyguard.shared.ComposeLockscreen

import com.android.systemui.media.controls.util.MediaInSceneContainerFlag

import dagger.Module

import dagger.Provides
@@ -45,6 +46,7 @@ object SceneContainerFlag { 
            sceneContainer() && // mainAconfigFlag

                keyguardBottomAreaRefactor() &&

                migrateClocksToBlueprint() &&

                ComposeLockscreen.isEnabled &&

                MediaInSceneContainerFlag.isEnabled &&

                // NOTE: Changes should also be made in getSecondaryFlags and @EnableSceneContainer

                ComposeFacade.isComposeAvailable()
@@ -65,6 +67,7 @@ object SceneContainerFlag { 
        sequenceOf(

            FlagToken(FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor()),

            FlagToken(FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, migrateClocksToBlueprint()),

            ComposeLockscreen.token,

            MediaInSceneContainerFlag.token,

            // NOTE: Changes should also be made in isEnabled and @EnableSceneContainer

        )

packages/SystemUI/tests/utils/src/com/android/systemui/flags/EnableSceneContainer.kt

+3 −1
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
package com.android.systemui.flags



import android.platform.test.annotations.EnableFlags

import com.android.systemui.Flags.FLAG_COMPOSE_LOCKSCREEN

import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR

import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT

import com.android.systemui.Flags.FLAG_MEDIA_IN_SCENE_CONTAINER

import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT

import com.android.systemui.Flags.FLAG_SCENE_CONTAINER



/**
@@ -30,6 +31,7 @@ import com.android.systemui.Flags.FLAG_SCENE_CONTAINER 
    FLAG_SCENE_CONTAINER,

    FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR,

    FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT,

    FLAG_COMPOSE_LOCKSCREEN,

    FLAG_MEDIA_IN_SCENE_CONTAINER,

)

@Retention(AnnotationRetention.RUNTIME)