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

Commit 9f1c9359 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Moves hardcoded enabledness check into SceneContainerFlags." into main

parents 6801f964 eb992e6b

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

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ constructor( 
            listOf(ComposeMustBeAvailable(), CompileTimeFlagMustBeEnabled())



    override fun isEnabled(): Boolean {

        return requirements.all { it.isMet() }

        // SCENE_CONTAINER_ENABLED is an explicit static flag check that helps with downstream

        // optimizations, e.g., unused code stripping. Do not remove!

        return Flags.SCENE_CONTAINER_ENABLED && requirements.all { it.isMet() }

    }



    override fun requirementDescription(): String {

packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ abstract class ShadeViewProviderModule { 
            scenesProvider: Provider<Set<@JvmSuppressWildcards Scene>>,

            layoutInsetController: NotificationInsetsController,

        ): WindowRootView {

            return if (Flags.SCENE_CONTAINER_ENABLED && sceneContainerFlags.isEnabled()) {

            return if (sceneContainerFlags.isEnabled()) {

                val sceneWindowRootView =

                    layoutInflater.inflate(R.layout.scene_window_root, null) as SceneWindowRootView

                sceneWindowRootView.init(