Introduce MutableSceneTransitionLayoutState (d91aca44) · Commits · e / os / android_frameworks_base

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

+23 −22

Original line number	Diff line number	Diff line
		@@ -28,9 +28,9 @@ import kotlinx.coroutines.launch
		* the currently running transition, if there is one.
		*/
		internal fun CoroutineScope.animateToScene(
		layoutState: SceneTransitionLayoutStateImpl,
		layoutState: BaseSceneTransitionLayoutState,
		target: SceneKey,
		) {
		): TransitionState.Transition? {
		val transitionState = layoutState.transitionState
		if (transitionState.currentScene == target) {
		// This can happen in 3 different situations, for which there isn't anything else to do:
		@@ -41,10 +41,10 @@ internal fun CoroutineScope.animateToScene(
		// a. didn't release their pointer yet.
		// b. released their pointer such that the swipe gesture was cancelled and the
		// transition is currently animating back to [target].
		return
		return null
		}

		when (transitionState) {
		return when (transitionState) {
		is TransitionState.Idle -> animate(layoutState, target)
		is TransitionState.Transition -> {
		// A transition is currently running: first check whether `transition.toScene` or
		@@ -62,47 +62,43 @@ internal fun CoroutineScope.animateToScene(
		// finish the current transition early to make sure that the current state
		// change is committed.
		layoutState.finishTransition(transitionState, transitionState.currentScene)
		null
		} else {
		// The transition is in progress: start the canned animation at the same
		// progress as it was in.
		// TODO(b/290184746): Also take the current velocity into account.
		animate(layoutState, target, startProgress = progress)
		}

		return
		}

		if (transitionState.fromScene == target) {
		} else if (transitionState.fromScene == target) {
		// There is a transition from [target] to another scene: simply animate the same
		// transition progress to `0`.

		check(transitionState.toScene == transitionState.currentScene)

		val progress = transitionState.progress
		if (progress.absoluteValue < ProgressVisibilityThreshold) {
		// The transition is at progress ~= 0: no need to animate.We finish the current
		// transition early to make sure that the current state change is committed.
		layoutState.finishTransition(transitionState, transitionState.currentScene)
		null
		} else {
		// TODO(b/290184746): Also take the current velocity into account.
		animate(layoutState, target, startProgress = progress, reversed = true)
		}

		return
		}

		} else {
		// Generic interruption; the current transition is neither from or to [target].
		// TODO(b/290930950): Better handle interruptions here.
		animate(layoutState, target)
		}
		}
		}
		}

		private fun CoroutineScope.animate(
		layoutState: SceneTransitionLayoutStateImpl,
		layoutState: BaseSceneTransitionLayoutState,
		target: SceneKey,
		startProgress: Float = 0f,
		reversed: Boolean = false,
		) {
		): TransitionState.Transition {
		val fromScene = layoutState.transitionState.currentScene
		val isUserInput =
		(layoutState.transitionState as? TransitionState.Transition)?.isInitiatedByUserInput
		@@ -143,10 +139,15 @@ private fun CoroutineScope.animate(
		}

		// Animate the progress to its target value.
		launch {
		animatable.animateTo(targetProgress, animationSpec)
		launch { animatable.animateTo(targetProgress, animationSpec) }
		.invokeOnCompletion {
		// Settle the state to Idle(target). Note that this will do nothing if this transition
		// was replaced/interrupted by another one, and this also runs if this coroutine is
		// cancelled, i.e. if [this] coroutine scope is cancelled.
		layoutState.finishTransition(transition, target)
		}

		return transition
		}

		private class OneOffTransition(

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ internal fun shouldDrawOrComposeSharedElement(
		}

		private fun isSharedElementEnabled(
		layoutState: SceneTransitionLayoutStateImpl,
		layoutState: BaseSceneTransitionLayoutState,
		transition: TransitionState.Transition,
		element: ElementKey,
		): Boolean {
		@@ -312,7 +312,7 @@ private fun isSharedElementEnabled(
		}

		internal fun sharedElementTransformation(
		layoutState: SceneTransitionLayoutStateImpl,
		layoutState: BaseSceneTransitionLayoutState,
		transition: TransitionState.Transition,
		element: ElementKey,
		): SharedElementTransformation? {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ internal class SceneGestureHandler(
		// immediately go back B => A.
		if (targetScene != swipeTransition._currentScene) {
		swipeTransition._currentScene = targetScene
		layoutImpl.state.onChangeScene(targetScene.key)
		with(layoutImpl.state) { coroutineScope.onChangeScene(targetScene.key) }
		}

		animateOffset(

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ internal fun SceneTransitionLayoutForTesting(
		val coroutineScope = rememberCoroutineScope()
		val layoutImpl = remember {
		SceneTransitionLayoutImpl(
		state = state as SceneTransitionLayoutStateImpl,
		state = state as BaseSceneTransitionLayoutState,
		density = density,
		edgeDetector = edgeDetector,
		transitionInterceptionThreshold = transitionInterceptionThreshold,

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -48,12 +48,12 @@ internal typealias MovableElementContent =

		@Stable
		internal class SceneTransitionLayoutImpl(
		internal val state: SceneTransitionLayoutStateImpl,
		internal val state: BaseSceneTransitionLayoutState,
		internal var density: Density,
		internal var edgeDetector: EdgeDetector,
		internal var transitionInterceptionThreshold: Float,
		builder: SceneTransitionLayoutScope.() -> Unit,
		coroutineScope: CoroutineScope,
		private val coroutineScope: CoroutineScope,
		) {
		/**
		* The map of [Scene]s.
		@@ -243,7 +243,7 @@ internal class SceneTransitionLayoutImpl(
		// TODO(b/290184746): Make sure that this works with SystemUI once we use
		// SceneTransitionLayout in Flexiglass.
		scene(state.transitionState.currentScene).userActions[Back]?.let { backScene ->
		BackHandler { state.onChangeScene(backScene) }
		BackHandler { with(state) { coroutineScope.onChangeScene(backScene) } }
		}

		Box {