Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ba33546 authored by Omar Miatello's avatar Omar Miatello
Browse files

STL refactor SceneTransitionLayoutImpl 

This simplify the review of subsequent CLs.

Test: Just a refactor
Bug: 419520966
Flag: EXEMPT sort parameters
Change-Id: I2a532dbe354e4049f3654c1b96c1670eb4a65e95
parent 76d0f17c

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) }

    }

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

+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) }