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

Commit cd948b16 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topic "stl-interruptions" into main 

* changes:
  Introduce STLState.currentTransitions: List<TransitionState>
  Move transformationSpec and overscrollSpec to Transition
parents 785f5df0 5c465d5b

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

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,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,

        )

    }