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

Commit 923c3ee0 authored by omarmt's avatar omarmt
Browse files

Add overscrollDisabled DSL in SceneTransitionsBuilder [1/2] 

overscrollDisabled will prevents overscroll the scene in the given
orientation, allowing ancestors to eventually consume the remaining
gesture.

Test: atest TransitionDslTest
Bug: 336710600
Flag: com.android.systemui.scene_container
Change-Id: Ied5e716449b0bc50c690c15fc2f9c8f273afb3e9
parent 9bc29411

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ val sceneTransitions = transitions { 
    }

    // Disable horizontal overscroll. If the scene is overscrolled too soon after showing, this

    // can lead to inconsistent KeyguardState changes.

    overscroll(CommunalScenes.Communal, Orientation.Horizontal) {}

    overscrollDisabled(CommunalScenes.Communal, Orientation.Horizontal)

}



/**

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ val SceneContainerTransitions = transitions { 


    // Scene overscroll



    overscroll(Scenes.Gone, Orientation.Vertical) {}

    overscrollDisabled(Scenes.Gone, Orientation.Vertical)

    overscroll(Scenes.Bouncer, Orientation.Vertical) {

        translate(Bouncer.Elements.Content, y = { absoluteDistance })

    }

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

+7 −1
Original line number Diff line number Diff line
@@ -104,8 +104,14 @@ interface SceneTransitionsBuilder { 
    fun overscroll(

        scene: SceneKey,

        orientation: Orientation,

        builder: OverscrollBuilder.() -> Unit = {},

        builder: OverscrollBuilder.() -> Unit,

    ): OverscrollSpec



    /**

     * Prevents overscroll the [scene] in the given [orientation], allowing ancestors to eventually

     * consume the remaining gesture.

     */

    fun overscrollDisabled(scene: SceneKey, orientation: Orientation): OverscrollSpec

}



interface BaseTransitionBuilder : PropertyTransformationBuilder {

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

+17 −1
Original line number Diff line number Diff line
@@ -86,6 +86,22 @@ private class SceneTransitionsBuilderImpl : SceneTransitionsBuilder { 
        builder: OverscrollBuilder.() -> Unit

    ): OverscrollSpec {

        val impl = OverscrollBuilderImpl().apply(builder)

        check(impl.transformations.isNotEmpty()) {

            "This method does not allow empty transformations. " +

                "Use overscrollDisabled($scene, $orientation) instead."

        }

        return overscrollSpec(scene, orientation, impl)

    }



    override fun overscrollDisabled(scene: SceneKey, orientation: Orientation): OverscrollSpec {

        return overscrollSpec(scene, orientation, OverscrollBuilderImpl())

    }



    private fun overscrollSpec(

        scene: SceneKey,

        orientation: Orientation,

        impl: OverscrollBuilderImpl,

    ): OverscrollSpec {

        val spec =

            OverscrollSpecImpl(

                scene = scene,
@@ -97,7 +113,7 @@ private class SceneTransitionsBuilderImpl : SceneTransitionsBuilder { 
                        distance = impl.distance,

                        transformations = impl.transformations,

                    ),

                progressConverter = impl.progressConverter

                progressConverter = impl.progressConverter,

            )

        transitionOverscrollSpecs.add(spec)

        return spec

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

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ class AnimatedSharedAsStateTest { 
            rule.runOnUiThread {

                MutableSceneTransitionLayoutStateImpl(

                    SceneA,

                    transitions { overscroll(SceneB, Orientation.Horizontal) }

                    transitions { overscrollDisabled(SceneB, Orientation.Horizontal) }

                )

            }