diff options
4 files changed, 13 insertions, 10 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt index 27a834bdeb2d..45a83933a7ce 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt @@ -401,10 +401,10 @@ private fun SceneScope.NotificationPlaceholder( viewModel: NotificationsPlaceholderViewModel, modifier: Modifier = Modifier, ) { - Element( - Notifications.Elements.NotificationStackPlaceholder, + Box( modifier = modifier + .element(Notifications.Elements.NotificationStackPlaceholder) .debugBackground(viewModel, DEBUG_STACK_COLOR) .onSizeChanged { size -> debugLog(viewModel) { "STACK onSizeChanged: size=$size" } } .onGloballyPositioned { coordinates: LayoutCoordinates -> @@ -419,9 +419,7 @@ private fun SceneScope.NotificationPlaceholder( stackScrollView.setStackTop(positionInWindow.y) stackScrollView.setStackBottom(positionInWindow.y + coordinates.size.height) } - ) { - content {} - } + ) } private fun calculateCornerRadius( 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 68395b463b6a..5dc833be91bb 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 @@ -103,11 +103,12 @@ val SceneContainerTransitions = transitions { overscroll(Scenes.Shade, Orientation.Vertical) { translate( Notifications.Elements.NotificationScrim, - y = { Shade.Dimensions.ScrimOverscrollLimit } + y = Shade.Dimensions.ScrimOverscrollLimit ) + translate(Shade.Elements.SplitShadeStartColumn, y = Shade.Dimensions.ScrimOverscrollLimit) translate( - Shade.Elements.SplitShadeStartColumn, - y = { Shade.Dimensions.ScrimOverscrollLimit } + Notifications.Elements.NotificationStackPlaceholder, + y = Shade.Dimensions.ScrimOverscrollLimit, ) } overscroll(Scenes.NotificationsShade, Orientation.Vertical) { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt index d51cdd3036f4..ec81e23ae46b 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt @@ -115,7 +115,7 @@ object Shade { object Dimensions { val ScrimCornerSize = 32.dp val HorizontalPadding = 16.dp - const val ScrimOverscrollLimit = 100f + val ScrimOverscrollLimit = 32.dp const val ScrimVisibilityThreshold = 5f } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt index 85835d22f183..a21db12db80b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt @@ -81,7 +81,11 @@ constructor( (transitionState.fromScene in SceneFamilies.NotifShade && transitionState.toScene == quickSettingsScene) || (transitionState.fromScene in quickSettingsScene && - transitionState.toScene in SceneFamilies.NotifShade) + transitionState.toScene in SceneFamilies.NotifShade) || + (transitionState.fromScene == Scenes.Lockscreen && + transitionState.toScene in SceneFamilies.NotifShade) || + (transitionState.fromScene in SceneFamilies.NotifShade && + transitionState.toScene == Scenes.Lockscreen) ) { 1f } else if ( |