diff options
12 files changed, 24 insertions, 24 deletions
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt index bb61a131dac3..974442494181 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt @@ -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 diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt index e819bfd18578..07a19d83c995 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt @@ -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 = diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt index 86c5fd824d8f..e8b2b09da377 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt @@ -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 = diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt index 59d0b55c1db8..5aaeda84edf0 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt @@ -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( diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt index d66fe42084de..29be445e82bb 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt @@ -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]. * diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/reveal/ContainerReveal.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/reveal/ContainerReveal.kt index bfb5ca733d90..944bd85991c9 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/reveal/ContainerReveal.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/reveal/ContainerReveal.kt @@ -157,7 +157,7 @@ private class VerticalContainerRevealSizeTransformation( val idleSize = checkNotNull(element.targetSize(content)) val userActionDistance = idleSize.height val progress = - when ((transition as? TransitionState.HasOverscrollProperties)?.bouncingContent) { + when ((transition as? TransitionState.DirectionProperties)?.bouncingContent) { null -> transition.progressTo(content) content -> 1f else -> 0f @@ -256,7 +256,7 @@ private class ContainerRevealAlphaTransformation( private fun targetAlpha(transition: TransitionState.Transition, content: ContentKey): Float { if (transition.isUserInputOngoing) { - if (transition !is TransitionState.HasOverscrollProperties) { + if (transition !is TransitionState.DirectionProperties) { error( "Unsupported transition driven by user input but that does not have " + "overscroll properties: $transition" diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt index 2f4d5bff8b41..432add38385a 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt @@ -60,7 +60,7 @@ private constructor( // As this object is created by OverscrollBuilderImpl and we retrieve the current // OverscrollSpec only when the transition implements HasOverscrollProperties, we can assume // that this method was invoked after performing this check. - val overscrollProperties = transition as TransitionState.HasOverscrollProperties + val overscrollProperties = transition as TransitionState.DirectionProperties val overscrollScope = cachedOverscrollScope.getFromCacheOrCompute(density = this, overscrollProperties) @@ -77,17 +77,17 @@ private constructor( /** * A helper class to cache a [OverscrollScope] given a [Density] and - * [TransitionState.HasOverscrollProperties]. This helps avoid recreating a scope every frame - * whenever an overscroll transition is computed. + * [TransitionState.DirectionProperties]. This helps avoid recreating a scope every frame whenever + * an overscroll transition is computed. */ private class CachedOverscrollScope { private var previousScope: OverscrollScope? = null private var previousDensity: Density? = null - private var previousOverscrollProperties: TransitionState.HasOverscrollProperties? = null + private var previousOverscrollProperties: TransitionState.DirectionProperties? = null fun getFromCacheOrCompute( density: Density, - overscrollProperties: TransitionState.HasOverscrollProperties, + overscrollProperties: TransitionState.DirectionProperties, ): OverscrollScope { if ( previousScope == null || diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt index 1959f5914821..ffba63988cfc 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt @@ -2853,7 +2853,7 @@ class ElementTest { // Start an overscrollable transition driven by progress. var progress by mutableFloatStateOf(0f) val transition = transition(from = SceneA, to = SceneB, progress = { progress }) - assertThat(transition).isInstanceOf(TransitionState.HasOverscrollProperties::class.java) + assertThat(transition).isInstanceOf(TransitionState.DirectionProperties::class.java) scope.launch { state.startTransition(transition) } // Reset the counters after the first animation frame. diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/subjects/TransitionStateSubject.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/subjects/TransitionStateSubject.kt index 0adb4809dd2d..9a2af640c46f 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/subjects/TransitionStateSubject.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/subjects/TransitionStateSubject.kt @@ -168,12 +168,12 @@ abstract class BaseTransitionSubject<T : TransitionState.Transition>( fun hasBouncingContent(content: ContentKey) { val actual = actual - if (actual !is TransitionState.HasOverscrollProperties) { + if (actual !is TransitionState.DirectionProperties) { failWithActual(simpleFact("expected to be ContentState.HasOverscrollProperties")) } check("bouncingContent") - .that((actual as TransitionState.HasOverscrollProperties).bouncingContent) + .that((actual as TransitionState.DirectionProperties).bouncingContent) .isEqualTo(content) } } diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestOverlayTransition.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestOverlayTransition.kt index 646cff8b944c..6015479d8e21 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestOverlayTransition.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestOverlayTransition.kt @@ -71,7 +71,7 @@ fun transition( ): TestOverlayTransition { return object : TestOverlayTransition(fromScene, overlay, replacedTransition), - TransitionState.HasOverscrollProperties { + TransitionState.DirectionProperties { override val isEffectivelyShown: Boolean get() = isEffectivelyShown() diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestReplaceOverlayTransition.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestReplaceOverlayTransition.kt index c342f488212a..bd2118dd8395 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestReplaceOverlayTransition.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestReplaceOverlayTransition.kt @@ -68,7 +68,7 @@ fun transition( ): TestReplaceOverlayTransition { return object : TestReplaceOverlayTransition(from, to, replacedTransition), - TransitionState.HasOverscrollProperties { + TransitionState.DirectionProperties { override val effectivelyShownOverlay: OverlayKey get() = effectivelyShownOverlay() diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestSceneTransition.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestSceneTransition.kt index d24b895c3050..1d27e3a3f191 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestSceneTransition.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/test/TestSceneTransition.kt @@ -62,7 +62,7 @@ fun transition( replacedTransition: Transition? = null, ): TestSceneTransition { return object : - TestSceneTransition(from, to, replacedTransition), TransitionState.HasOverscrollProperties { + TestSceneTransition(from, to, replacedTransition), TransitionState.DirectionProperties { override val currentScene: SceneKey get() = current() |