diff options
| author | 2024-06-03 13:00:59 +0000 | |
|---|---|---|
| committer | 2024-06-03 14:36:09 +0000 | |
| commit | f22d310d72b81d59d0a04ad9f29a47340c9e7c19 (patch) | |
| tree | ccb7271e8f8f215958b0c4e27955d5c587d28a4a | |
| parent | 532e378b8fc4dfb01b6be3344e9e020ce2bbd968 (diff) | |
[bc25] Use the DSL's `translate()` overload with DP instead of factory.
For more context, see the last comments on ag/27595541.
Test: Unit tests build and pass.
Bug: 342463447
Bug: 337849926
Flag: com.android.systemui.dual_shade
Change-Id: I9c58eb75def1b6db2731211ff21cf1fa3d4fd5ba
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt index 3255b0805fdb..10c403055c8e 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt @@ -104,9 +104,9 @@ val SceneContainerTransitions = transitions { ) } overscroll(Scenes.NotificationsShade, Orientation.Vertical) { - translate(OverlayShade.Elements.Panel, y = { OverlayShade.Dimensions.OverscrollLimit }) + translate(OverlayShade.Elements.Panel, y = OverlayShade.Dimensions.OverscrollLimit) } overscroll(Scenes.QuickSettingsShade, Orientation.Vertical) { - translate(OverlayShade.Elements.Panel, y = { OverlayShade.Dimensions.OverscrollLimit }) + translate(OverlayShade.Elements.Panel, y = OverlayShade.Dimensions.OverscrollLimit) } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt index d776e2ad5fe0..6924d432453c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt @@ -199,7 +199,7 @@ object OverlayShade { val PanelCornerRadius = 46.dp val PanelWidthMedium = 390.dp val PanelWidthLarge = 474.dp - val OverscrollLimit = 100f + val OverscrollLimit = 32.dp } object Shapes { |