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

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

Merge "[flexiglass] Adds keyguard_wm_state_refactor to flexi flags." into main

parents 8fb4bcfb ff1c647f

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

+5 −1
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ 
package com.android.systemui.scene.shared.flag



import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR

import com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR

import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT

import com.android.systemui.Flags.FLAG_SCENE_CONTAINER

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.Flags.keyguardWmStateRefactor

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.Flags.sceneContainer

import com.android.systemui.dagger.SysUISingleton
@@ -46,7 +48,8 @@ object SceneContainerFlag { 
                keyguardBottomAreaRefactor() &&

                migrateClocksToBlueprint() &&

                ComposeLockscreen.isEnabled &&

                MediaInSceneContainerFlag.isEnabled

                MediaInSceneContainerFlag.isEnabled &&

                keyguardWmStateRefactor()

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



    /**
@@ -65,6 +68,7 @@ object SceneContainerFlag { 
        sequenceOf(

            FlagToken(FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor()),

            FlagToken(FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, migrateClocksToBlueprint()),

            FlagToken(FLAG_KEYGUARD_WM_STATE_REFACTOR, keyguardWmStateRefactor()),

            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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 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_KEYGUARD_WM_STATE_REFACTOR

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
@@ -33,6 +34,7 @@ import com.android.systemui.Flags.FLAG_SCENE_CONTAINER 
    FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT,

    FLAG_COMPOSE_LOCKSCREEN,

    FLAG_MEDIA_IN_SCENE_CONTAINER,

    FLAG_KEYGUARD_WM_STATE_REFACTOR,

)

@Retention(AnnotationRetention.RUNTIME)

@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)