Merge "[flexiglass] Introduces forced disablement of Flexi by variants" into main (8d0f961c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ constructor(
		printSection("SceneContainerFlag") {
		printSection("Framework availability") {
		println("isEnabled", SceneContainerFlag.isEnabled)
		println("isEnabledOnVariant", SceneContainerFlag.isEnabledOnVariant)
		}

		if (!SceneContainerFlag.isEnabled) {

+12 −1

Original line number	Diff line number	Diff line
		@@ -26,10 +26,21 @@ object SceneContainerFlag {
		/** The flag description -- not an aconfig flag name */
		const val DESCRIPTION = "SceneContainerFlag"

		/**
		* Whether the flag is enabled on the current variant. If this is set to `false`, then it the
		* value of the actual aconfig flag doesn't matter and [isEnabled] will always return `false`.
		*
		* Some variants of System UI, for example Automotive OS, do not support the scene container
		* framework. In order for that variant to be able to force it off, this property must be set to
		* `false` as early as possible in the runtime of the app (ideally, in the constructor the
		* Application class).
		*/
		@JvmField var isEnabledOnVariant: Boolean = true

		@JvmStatic
		inline val isEnabled
		// NOTE: Changes should also be made in @EnableSceneContainer
		get() = sceneContainer()
		get() = sceneContainer() && isEnabledOnVariant

		/**
		* Called to ensure code is only run when the flag is enabled. This protects users from the