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

Commit 5c465d5b authored Mar 12, 2024 by Jordan Demeulenaere

Introduce STLState.currentTransitions: List<TransitionState>

This CL adds the foundation for interruptions in STL: multiple
transitions can now run in parallel. This means that the state is now
either Idle or List<Transition>. However, for backward compatibility,
the old API is preserved and this CL exposes a new currentTransitions
list that can be used by consumers that want to handle interruptions.
For the current callers, STLState.currentTransition still represents the
last/current transition and the behavior is unchanged.

This is mostly a pure refactoring that should not have any impact on
current usages, but there is an important change: transitions now *have
to* call STLState.finishTransition() once they are finished, even if
they are not the last/current transition. This change only impacts
library STL code and not consumer code given that user code is not
supposed to create custom Transitions (yet).

This CL introduces a flag to disable interruptions. This flag is enabled
by default so that the tests cover the new code, but it is explicitly
disabled in current production usages (Flexiglass, Bouncer, Lockscreen,
Communal). It is enabled by default in the STL demo app.

See b/290930950#comment5 for more information about the upcoming
interruptions support.

Bug: 290930950
Test: atest SceneTransitionLayoutStateTest
Test: Ran all STL tests with both values for the interruptions flag
Flag: N/A

Change-Id: Ia6669cc6d305b2f17ee9a805082f0b7bda56f06e

parent 6141b370

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -480,6 +480,7 @@ private fun FoldAware(
		onChangeScene = {},
		transitions = SceneTransitions,
		modifier = modifier,
		enableInterruptions = false,
		) {
		scene(SceneKeys.ContiguousSceneKey) {
		FoldableScene(

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ fun CommunalContainer(
		currentScene,
		onChangeScene = { viewModel.onSceneChanged(it) },
		transitions = sceneTransitions,
		enableInterruptions = false,
		)
		val touchesAllowed by viewModel.touchesAllowed.collectAsState(initial = false)

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenContent.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ constructor(
		transitions =
		transitions { sceneKeyByBlueprintId.values.forEach { sceneKey -> to(sceneKey) } },
		modifier = modifier,
		enableInterruptions = false,
		) {
		sceneKeyByBlueprint.entries.forEach { (blueprint, sceneKey) ->
		scene(sceneKey) { with(blueprint) { Content(Modifier.fillMaxSize()) } }

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/TopAreaSection.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ constructor(
		currentScene = currentScene,
		onChangeScene = {},
		transitions = ClockTransition.defaultClockTransitions,
		enableInterruptions = false,
		) {
		scene(ClockScenes.splitShadeLargeClockScene) {
		Row(

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ fun SceneContainer(
		initialScene = currentSceneKey,
		canChangeScene = { toScene -> viewModel.canChangeScene(toScene) },
		transitions = SceneContainerTransitions,
		enableInterruptions = false,
		)
		}