Merge "STL rename HasOverscrollProperties to DirectionProperties" into main (cc2f31b2) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
		import androidx.compose.ui.unit.round
		import androidx.compose.ui.util.fastCoerceIn
		import com.android.compose.animation.scene.content.Content
		import com.android.compose.animation.scene.content.state.TransitionState.HasOverscrollProperties.Companion.DistanceUnspecified
		import com.android.compose.animation.scene.content.state.TransitionState.DirectionProperties.Companion.DistanceUnspecified
		import com.android.compose.nestedscroll.OnStopScope
		import com.android.compose.nestedscroll.PriorityNestedScrollConnection
		import com.android.compose.nestedscroll.ScrollController

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1257,7 +1257,7 @@ private inline fun <T> computeValue(
		}

		val currentContent = currentContentState.content
		if (transition is TransitionState.HasOverscrollProperties) {
		if (transition is TransitionState.DirectionProperties) {
		val overscroll = transition.currentOverscrollSpec
		if (overscroll?.content == currentContent) {
		val elementSpec =

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@ internal class MutableSceneTransitionLayoutStateImpl(
		// Compute the [TransformationSpec] when the transition starts.
		val fromContent = transition.fromContent
		val toContent = transition.toContent
		val orientation = (transition as? TransitionState.HasOverscrollProperties)?.orientation
		val orientation = (transition as? TransitionState.DirectionProperties)?.orientation

		// Update the transition specs.
		transition.transformationSpec =

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import androidx.compose.runtime.mutableFloatStateOf
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.setValue
		import com.android.compose.animation.scene.content.state.TransitionState
		import com.android.compose.animation.scene.content.state.TransitionState.HasOverscrollProperties.Companion.DistanceUnspecified
		import com.android.compose.animation.scene.content.state.TransitionState.DirectionProperties.Companion.DistanceUnspecified
		import kotlin.math.absoluteValue
		import kotlinx.coroutines.CompletableDeferred
		import kotlinx.coroutines.launch
		@@ -197,7 +197,7 @@ internal class SwipeAnimation<T : ContentKey>(
		private val distance: (SwipeAnimation<T>) -> Float,
		currentContent: T = fromContent,
		dragOffset: Float = 0f,
		) : TransitionState.HasOverscrollProperties {
		) : TransitionState.DirectionProperties {
		/** The [TransitionState.Transition] whose implementation delegates to this [SwipeAnimation]. */
		lateinit var contentTransition: TransitionState.Transition

		@@ -513,7 +513,7 @@ private class ChangeSceneSwipeTransition(
		swipeAnimation.toContent,
		replacedTransition,
		),
		TransitionState.HasOverscrollProperties by swipeAnimation {
		TransitionState.DirectionProperties by swipeAnimation {

		constructor(
		other: ChangeSceneSwipeTransition
		@@ -575,7 +575,7 @@ private class ShowOrHideOverlaySwipeTransition(
		swipeAnimation.toContent,
		replacedTransition,
		),
		TransitionState.HasOverscrollProperties by swipeAnimation {
		TransitionState.DirectionProperties by swipeAnimation {
		constructor(
		other: ShowOrHideOverlaySwipeTransition
		) : this(
		@@ -634,7 +634,7 @@ private class ReplaceOverlaySwipeTransition(
		swipeAnimation.toContent,
		replacedTransition,
		),
		TransitionState.HasOverscrollProperties by swipeAnimation {
		TransitionState.DirectionProperties by swipeAnimation {
		constructor(
		other: ReplaceOverlaySwipeTransition
		) : this(

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ sealed interface TransitionState {
		* every time progress is changed.
		*/
		private val _currentOverscrollSpec: State<OverscrollSpecImpl?>? =
		if (this !is HasOverscrollProperties) {
		if (this !is DirectionProperties) {
		null
		} else {
		derivedStateOf {
		@@ -406,7 +406,7 @@ sealed interface TransitionState {
		/** Returns if the [progress] value of this transition can go beyond range `[0; 1]` */
		internal fun isWithinProgressRange(progress: Float): Boolean {
		// If the properties are missing we assume that every [Transition] can overscroll
		if (this !is HasOverscrollProperties) return true
		if (this !is DirectionProperties) return true
		// [OverscrollSpec] for the current scene, even if it hasn't started overscrolling yet.
		val specForCurrentScene =
		when {
		@@ -444,7 +444,7 @@ sealed interface TransitionState {
		}
		}

		interface HasOverscrollProperties {
		interface DirectionProperties {
		/**
		* The position of the [Transition.toContent].
		*