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

Commit fd31d994 authored by omarmt's avatar omarmt
Browse files

STL: Default overscroll ProgressConverter slowly approaches 0.2f [1/2] 

In some previous CL we introduced a new default ProgressConverter for
Flexiglass ag/28922176 and the Demo app ag/28945142.
This CL introduces the default for STL in general as well.

Before and after attached to b/336710600#comment20

Test: No test for the new default behavior
Bug: 336710600
Flag: com.android.systemui.scene_container
Change-Id: I43f014e7d6c659911a864bba861ba8da0d1dfd13
parent e935760f

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

+2 −2
Original line number Diff line number Diff line
@@ -523,8 +523,8 @@ fun interface ProgressConverter { 
    fun convert(progress: Float): Float



    companion object {

        /** Keeps scrolling linearly */

        val Default = linear()

        /** Starts linearly with some resistance and slowly approaches to 0.2f */

        val Default = tanh(maxProgress = 0.2f, tilt = 3f)



        /**

         * The scroll stays linear, with [factor] you can control how much resistance there is.

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

+6 −1
Original line number Diff line number Diff line
@@ -724,6 +724,7 @@ class ElementTest { 
                layoutHeight = layoutHeight,

                sceneTransitions = {

                    overscroll(SceneB, Orientation.Vertical) {

                        progressConverter = ProgressConverter.linear()

                        // On overscroll 100% -> Foo should translate by overscrollTranslateY

                        translate(TestElements.Foo, y = overscrollTranslateY)

                    }
@@ -780,6 +781,7 @@ class ElementTest { 
                    transitions =

                        transitions {

                            overscroll(SceneB, Orientation.Vertical) {

                                progressConverter = ProgressConverter.linear()

                                translate(TestElements.Foo, y = overscrollTranslateY)

                            }

                        }
@@ -921,6 +923,7 @@ class ElementTest { 
                layoutHeight = layoutHeight,

                sceneTransitions = {

                    overscroll(SceneB, Orientation.Vertical) {

                        progressConverter = ProgressConverter.linear()

                        // On overscroll 100% -> Foo should translate by layoutHeight

                        translate(TestElements.Foo, y = { absoluteDistance })

                    }
@@ -1015,7 +1018,7 @@ class ElementTest { 
                layoutHeight = layoutHeight,

                sceneTransitions = {

                    // Overscroll progress will be linear (by default)

                    defaultOverscrollProgressConverter = ProgressConverter { it }

                    defaultOverscrollProgressConverter = ProgressConverter.linear()



                    overscroll(SceneB, Orientation.Vertical) {

                        // This override the defaultOverscrollProgressConverter
@@ -1125,6 +1128,7 @@ class ElementTest { 
                        )



                    overscroll(SceneB, Orientation.Vertical) {

                        progressConverter = ProgressConverter.linear()

                        // On overscroll 100% -> Foo should translate by layoutHeight

                        translate(TestElements.Foo, y = { absoluteDistance })

                    }
@@ -1861,6 +1865,7 @@ class ElementTest { 
                    SceneA,

                    transitions {

                        overscroll(SceneB, Orientation.Vertical) {

                            progressConverter = ProgressConverter.linear()

                            translate(TestElements.Foo, y = 15.dp)

                        }

                    }

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

+1 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ class SwipeToSceneTest { 
                        from(SceneA, to = SceneB) { distance = FixedDistance(swipeDistance) }



                        overscroll(SceneB, Orientation.Vertical) {

                            progressConverter = ProgressConverter.linear()

                            translate(TestElements.Foo, x = { 20.dp.toPx() }, y = { 30.dp.toPx() })

                        }

                    }