Merge "Make buildDirectionalMotionSpec match the style of `motionSpec` builder" into main (7ee4b020) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/mechanics/TransitionScopedMechanicsAdapterTest.kt

+4 −7

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ import com.android.compose.animation.scene.transitions
		import com.android.mechanics.spec.InputDirection
		import com.android.mechanics.spec.Mapping
		import com.android.mechanics.spec.MotionSpec
		import com.android.mechanics.spec.buildDirectionalMotionSpec
		import com.android.mechanics.spec.builder.directionalMotionSpec
		import com.android.mechanics.spring.SpringParameters
		import com.google.common.truth.Truth
		import kotlinx.coroutines.CoroutineScope
		@@ -95,7 +95,7 @@ class TransitionScopedMechanicsAdapterTest {
		val specFactory: SpecFactory = { _, _ ->
		MotionSpec(
		// Linearly animate from 10 down to 0
		buildDirectionalMotionSpec(TestSpring, Mapping.Fixed(50.dp.toPx())) {
		directionalMotionSpec(TestSpring, Mapping.Fixed(50.dp.toPx())) {
		targetFromCurrent(breakpoint = 0f, to = 0f)
		constantValueFromCurrent(breakpoint = 1f)
		}
		@@ -116,7 +116,7 @@ class TransitionScopedMechanicsAdapterTest {
		val specFactory: SpecFactory = { _, _ ->
		MotionSpec(
		// Use a spring to toggle 10f -> 0f at a progress of 0.5
		buildDirectionalMotionSpec(TestSpring, Mapping.Fixed(50.dp.toPx())) {
		directionalMotionSpec(TestSpring, Mapping.Fixed(50.dp.toPx())) {
		constantValue(breakpoint = 0.5f, value = 0f)
		}
		)
		@@ -140,10 +140,7 @@ class TransitionScopedMechanicsAdapterTest {
		transformation(TestElements.Foo) {
		TestTransformation { _, _ ->
		MotionSpec(
		buildDirectionalMotionSpec(
		TestSpring,
		Mapping.Fixed(50.dp.toPx()),
		) {
		directionalMotionSpec(TestSpring, Mapping.Fixed(50.dp.toPx())) {
		constantValue(breakpoint = 0.3f, value = 0f)
		}
		)