From ff1c647f2c1fa8447009e32f408b4b8a3cbcbe9c Mon Sep 17 00:00:00 2001 From: Alejandro Nijamkin Date: Thu, 14 Mar 2024 15:30:18 -0700 Subject: [flexiglass] Adds keyguard_wm_state_refactor to flexi flags. We need it to make KeyguardOcclusionInteractor work for Flexiglass (which is in followup CL(s)). Bug: 308001302 Test: verified that flexiglass can be turned on and off using go/flexiglass-script after cl/615924471 Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT Change-Id: Ic194d97ac5b4a3a03e1c97c5aa14f1d96c74b181 --- .../com/android/systemui/scene/shared/flag/SceneContainerFlags.kt | 6 +++++- .../utils/src/com/android/systemui/flags/EnableSceneContainer.kt | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt index 1808d98cd692..467089d24f2c 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt @@ -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 diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/flags/EnableSceneContainer.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/flags/EnableSceneContainer.kt index cceb3ffab282..f65c74fcebc8 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/flags/EnableSceneContainer.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/flags/EnableSceneContainer.kt @@ -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) -- cgit v1.2.3-59-g8ed1b