diff options
| author | 2024-11-12 11:11:42 +0000 | |
|---|---|---|
| committer | 2024-11-12 11:11:42 +0000 | |
| commit | 16dbc7bcd740c03742d56c6b3ed9ffffaebdd9f3 (patch) | |
| tree | 641203cb526858064f71eb27aa3b7760365be0f5 | |
| parent | 1af6bb4f4b483c73205912d0cf3ed33299431410 (diff) | |
| parent | c8bd5803713d5bdf8014209d5a3107859bf923fc (diff) | |
Merge "Never bounce the interruptionProgress spring" into main
| -rw-r--r-- | packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt index 68f849188d8b..e3118d67b434 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt @@ -18,6 +18,7 @@ package com.android.compose.animation.scene.content.state import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D +import androidx.compose.animation.core.Spring import androidx.compose.animation.core.spring import androidx.compose.foundation.gestures.Orientation import androidx.compose.runtime.Stable @@ -381,7 +382,7 @@ sealed interface TransitionState { val progressSpec = spring( stiffness = swipeSpec.stiffness, - dampingRatio = swipeSpec.dampingRatio, + dampingRatio = Spring.DampingRatioNoBouncy, visibilityThreshold = ProgressVisibilityThreshold, ) animatable.animateTo(0f, progressSpec) |