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

Commit 250ece66 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Rename (Observable)Transition.ChangeCurrentScene to ChangeScene (1/2) 

Bug: 353679003
Test: atest PlatformComposeSceneTransitionLayoutTests
Flag: com.android.systemui.scene_container
Change-Id: I80c52b38ecc199a0113c7c3307bd1dc60e8d3212
parent 4bff504e

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ private fun SceneScope.stateForQuickSettingsContent( 
                else -> QSSceneAdapter.State.CLOSED

            }

        }

        is TransitionState.Transition.ChangeCurrentScene ->

        is TransitionState.Transition.ChangeScene ->

            with(transitionState) {

                when {

                    isSplitShade -> UnsquishingQS(squishiness)

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateToScene.kt

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ internal fun CoroutineScope.animateToScene( 
    layoutState: MutableSceneTransitionLayoutStateImpl,

    target: SceneKey,

    transitionKey: TransitionKey?,

): TransitionState.Transition.ChangeCurrentScene? {

): TransitionState.Transition.ChangeScene? {

    val transitionState = layoutState.transitionState

    if (transitionState.currentScene == target) {

        // This can happen in 3 different situations, for which there isn't anything else to do:
@@ -55,7 +55,7 @@ internal fun CoroutineScope.animateToScene( 
                replacedTransition = null,

            )

        }

        is TransitionState.Transition.ChangeCurrentScene -> {

        is TransitionState.Transition.ChangeScene -> {

            val isInitiatedByUserInput = transitionState.isInitiatedByUserInput



            // A transition is currently running: first check whether `transition.toScene` or
@@ -139,7 +139,7 @@ private fun CoroutineScope.animateToScene( 
    reversed: Boolean = false,

    fromScene: SceneKey = layoutState.transitionState.currentScene,

    chain: Boolean = true,

): TransitionState.Transition.ChangeCurrentScene {

): TransitionState.Transition.ChangeScene {

    val oneOffAnimation = OneOffAnimation()

    val targetProgress = if (reversed) 0f else 1f

    val transition =
@@ -184,7 +184,7 @@ private class OneOffSceneTransition( 
    override val isInitiatedByUserInput: Boolean,

    replacedTransition: TransitionState.Transition?,

    private val oneOffAnimation: OneOffAnimation,

) : TransitionState.Transition.ChangeCurrentScene(fromScene, toScene, replacedTransition) {

) : TransitionState.Transition.ChangeScene(fromScene, toScene, replacedTransition) {

    override val progress: Float

        get() = oneOffAnimation.progress

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/InterruptionHandler.kt

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ interface InterruptionHandler { 
     * @see InterruptionResult

     */

    fun onInterruption(

        interrupted: TransitionState.Transition.ChangeCurrentScene,

        interrupted: TransitionState.Transition.ChangeScene,

        newTargetScene: SceneKey,

    ): InterruptionResult?

}
@@ -76,7 +76,7 @@ class InterruptionResult( 
 */

object DefaultInterruptionHandler : InterruptionHandler {

    override fun onInterruption(

        interrupted: TransitionState.Transition.ChangeCurrentScene,

        interrupted: TransitionState.Transition.ChangeScene,

        newTargetScene: SceneKey,

    ): InterruptionResult {

        return InterruptionResult(

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ sealed interface ObservableTransitionState { 
    fun currentScene(): Flow<SceneKey> {

        return when (this) {

            is Idle -> flowOf(currentScene)

            is Transition.ChangeCurrentScene -> currentScene

            is Transition.ChangeScene -> currentScene

            is Transition.ShowOrHideOverlay -> flowOf(currentScene)

            is Transition.ReplaceOverlay -> flowOf(currentScene)

        }
@@ -94,7 +94,7 @@ sealed interface ObservableTransitionState { 
                .trimMargin()



        /** A transition animating between [fromScene] and [toScene]. */

        class ChangeCurrentScene(

        class ChangeScene(

            override val fromScene: SceneKey,

            override val toScene: SceneKey,

            val currentScene: Flow<SceneKey>,
@@ -174,8 +174,8 @@ sealed interface ObservableTransitionState { 
                previewProgress: Flow<Float> = flowOf(0f),

                isInPreviewStage: Flow<Boolean> = flowOf(false),

                currentOverlays: Flow<Set<OverlayKey>> = flowOf(emptySet()),

            ): ChangeCurrentScene {

                return ChangeCurrentScene(

            ): ChangeScene {

                return ChangeScene(

                    fromScene,

                    toScene,

                    currentScene,
@@ -210,8 +210,8 @@ fun SceneTransitionLayoutState.observableTransitionState(): Flow<ObservableTrans 
    return snapshotFlow {

            when (val state = transitionState) {

                is TransitionState.Idle -> ObservableTransitionState.Idle(state.currentScene)

                is TransitionState.Transition.ChangeCurrentScene -> {

                    ObservableTransitionState.Transition.ChangeCurrentScene(

                is TransitionState.Transition.ChangeScene -> {

                    ObservableTransitionState.Transition.ChangeScene(

                        fromScene = state.fromScene,

                        toScene = state.toScene,

                        currentScene = snapshotFlow { state.currentScene },

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt

+3 −3
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ internal class SceneTransitionLayoutImpl( 
                // Compose the new scene we are going to first.

                transitions.fastForEachReversed { transition ->

                    when (transition) {

                        is TransitionState.Transition.ChangeCurrentScene -> {

                        is TransitionState.Transition.ChangeScene -> {

                            maybeAdd(transition.toScene)

                            maybeAdd(transition.fromScene)

                        }
@@ -428,7 +428,7 @@ internal class SceneTransitionLayoutImpl( 


                    transitions.fastForEach { transition ->

                        when (transition) {

                            is TransitionState.Transition.ChangeCurrentScene -> {}

                            is TransitionState.Transition.ChangeScene -> {}

                            is TransitionState.Transition.ShowOrHideOverlay ->

                                maybeAdd(transition.overlay)

                            is TransitionState.Transition.ReplaceOverlay -> {
@@ -484,7 +484,7 @@ private class LayoutNode(var layoutImpl: SceneTransitionLayoutImpl) : 
        val width: Int

        val height: Int

        val transition =

            layoutImpl.state.currentTransition as? TransitionState.Transition.ChangeCurrentScene

            layoutImpl.state.currentTransition as? TransitionState.Transition.ChangeScene

        if (transition == null) {

            width = placeable.width

            height = placeable.height