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

Commit 9cc56b70 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Don't duplicate swipe distance logic in findTargetSceneAndDistance 

Bug: 291025415
Test: atest SceneTransitionLayoutTests
Change-Id: I91f5e874cc156249b16442dc5fdb24c595b3d912
parent 612e70e8

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

+2 −8
Original line number Diff line number Diff line
@@ -307,12 +307,6 @@ class SceneGestureHandler( 
    )



    private fun Scene.findTargetSceneAndDistance(directionOffset: Float): TargetScene {

        val maxDistance =

            when (orientation) {

                Orientation.Horizontal -> layoutImpl.size.width

                Orientation.Vertical -> layoutImpl.size.height

            }.toFloat()



        val upOrLeft = swipeTransition.upOrLeft(this)

        val downOrRight = swipeTransition.downOrRight(this)
@@ -321,13 +315,13 @@ class SceneGestureHandler( 
            directionOffset < 0f && upOrLeft != null -> {

                TargetScene(

                    sceneKey = upOrLeft,

                    distance = -maxDistance,

                    distance = -swipeTransition.absoluteDistance,

                )

            }

            directionOffset > 0f && downOrRight != null -> {

                TargetScene(

                    sceneKey = downOrRight,

                    distance = maxDistance,

                    distance = swipeTransition.absoluteDistance,

                )

            }

            else -> {