Merge "new defaultSwipeSpec" into main (f9b389f3) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.scene.ui.composable

		import androidx.compose.animation.core.spring
		import androidx.compose.foundation.gestures.Orientation
		import com.android.compose.animation.scene.ProgressConverter
		import com.android.compose.animation.scene.TransitionKey
		@@ -44,6 +45,7 @@ val SceneContainerTransitions = transitions {

		// Overscroll progress starts linearly with some resistance (3f) and slowly approaches 0.2f
		defaultOverscrollProgressConverter = ProgressConverter.tanh(maxProgress = 0.2f, tilt = 3f)
		defaultSwipeSpec = spring(stiffness = 300f, dampingRatio = 0.8f, visibilityThreshold = 0.5f)

		// Scene transitions

+1 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ internal constructor(
		internal val DefaultSwipeSpec =
		spring(
		stiffness = Spring.StiffnessMediumLow,
		dampingRatio = Spring.DampingRatioLowBouncy,
		visibilityThreshold = OffsetVisibilityThreshold,
		)

+4 −2

Original line number	Diff line number	Diff line
		@@ -1241,7 +1241,8 @@ class DraggableHandlerTest {
		fun overscroll_releaseBetween0And100Percent_up() = runGestureTest {
		// Make scene B overscrollable.
		layoutState.transitions = transitions {
		from(SceneA, to = SceneB) { spec = spring(dampingRatio = Spring.DampingRatioNoBouncy) }
		defaultSwipeSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy)
		from(SceneA, to = SceneB) {}
		overscroll(SceneB, Orientation.Vertical) { fade(TestElements.Foo) }
		}

		@@ -1272,7 +1273,8 @@ class DraggableHandlerTest {
		fun overscroll_releaseBetween0And100Percent_down() = runGestureTest {
		// Make scene C overscrollable.
		layoutState.transitions = transitions {
		from(SceneA, to = SceneC) { spec = spring(dampingRatio = Spring.DampingRatioNoBouncy) }
		defaultSwipeSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy)
		from(SceneA, to = SceneC) {}
		overscroll(SceneC, Orientation.Vertical) { fade(TestElements.Foo) }
		}