diff options
| author | 2024-06-25 19:43:36 +0000 | |
|---|---|---|
| committer | 2024-06-25 19:43:36 +0000 | |
| commit | ef8c09aa77d9c68d0b915e092fc29cfe25a24e1c (patch) | |
| tree | f8ecee426379c12a242d5833da8c0e3ac145acca | |
| parent | fa8cb026365b53bc20218d2ff3f27ad783a5bd42 (diff) | |
| parent | a84953202ae6827c10b093b6fc4a536f7aa31ac0 (diff) | |
Merge "Disable overscroll scene transition" into main
| -rw-r--r-- | packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt index 7c2f7fe51d67..d0c40041ee6a 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt @@ -7,6 +7,7 @@ import androidx.compose.animation.core.infiniteRepeatable import androidx.compose.animation.core.rememberInfiniteTransition import androidx.compose.animation.core.tween import androidx.compose.foundation.background +import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -137,6 +138,9 @@ val sceneTransitions = transitions { fade(Communal.Elements.Grid) } } + // Disable horizontal overscroll. If the scene is overscrolled too soon after showing, this + // can lead to inconsistent KeyguardState changes. + overscroll(CommunalScenes.Communal, Orientation.Horizontal) {} } /** |