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

Commit 40d62a22 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "STL Refactor, rename swipeSpec to motionSpatialSpec 1/2" into main

parents bc4ad051 e92eef07

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

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ import com.android.systemui.shade.ui.composable.Shade 
val SceneContainerTransitions = transitions {

    interruptionHandler = SceneContainerInterruptionHandler



    // Overscroll progress starts linearly with some resistance (3f) and slowly approaches 0.2f

    defaultSwipeSpec = spring(stiffness = 300f, dampingRatio = 0.8f, visibilityThreshold = 0.5f)

    defaultMotionSpatialSpec =

        spring(stiffness = 300f, dampingRatio = 0.8f, visibilityThreshold = 0.5f)



    // Scene transitions

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import kotlin.time.Duration.Companion.milliseconds 


fun TransitionBuilder.goneToSplitShadeTransition(durationScale: Double = 1.0) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    swipeSpec =

    motionSpatialSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import kotlin.time.Duration.Companion.milliseconds 


fun TransitionBuilder.lockscreenToSplitShadeTransition(durationScale: Double = 1.0) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    swipeSpec =

    motionSpatialSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ fun TransitionBuilder.notificationsShadeToQuickSettingsShadeTransition( 
    durationScale: Double = 1.0

) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    swipeSpec =

    motionSpatialSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import kotlin.time.Duration.Companion.milliseconds 


fun TransitionBuilder.toNotificationsShadeTransition(durationScale: Double = 1.0) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    swipeSpec =

    motionSpatialSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,