Merge "STL refactor SceneTransitionLayoutImpl" into main (8741aa9c) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -781,15 +781,15 @@ internal fun SceneTransitionLayoutForTesting(
		swipeSourceDetector = swipeSourceDetector,
		swipeDetector = swipeDetector,
		transitionInterceptionThreshold = transitionInterceptionThreshold,
		decayAnimationSpec = decayAnimationSpec,
		builder = builder,
		animationScope = animationScope,
		directionChangeSlop = directionChangeSlop,
		elements = sharedElementMap,
		ancestors = ancestors,
		implicitTestTags = implicitTestTags,
		lookaheadScope = lookaheadScope,
		directionChangeSlop = directionChangeSlop,
		defaultEffectFactory = defaultEffectFactory,
		decayAnimationSpec = decayAnimationSpec,
		implicitTestTags = implicitTestTags,
		)
		.also { onLayoutImpl?.invoke(it) }
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,6 +130,8 @@ class DraggableHandlerTest {
		swipeSourceDetector = DefaultEdgeDetector,
		swipeDetector = DefaultSwipeDetector,
		transitionInterceptionThreshold = transitionInterceptionThreshold,
		decayAnimationSpec =
		SplineBasedFloatDecayAnimationSpec(density).generateDecayAnimationSpec(),
		builder = scenesBuilder,

		// Use testScope and not backgroundScope here because backgroundScope does not
		@@ -137,8 +139,6 @@ class DraggableHandlerTest {
		animationScope = testScope,
		directionChangeSlop = directionChangeSlop,
		defaultEffectFactory = defaultEffectFactory,
		decayAnimationSpec =
		SplineBasedFloatDecayAnimationSpec(density).generateDecayAnimationSpec(),
		)
		.apply { setContentsAndLayoutTargetSizeForTest(LAYOUT_SIZE) }