Merge "[Flexiglass] Convert NotificationStackCutoffGuideline to a Rect" into main (30d2b8dd) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+82 −74

Original line number	Diff line number	Diff line
		@@ -40,9 +40,7 @@ import androidx.compose.foundation.layout.absoluteOffset
		import androidx.compose.foundation.layout.asPaddingValues
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.imeAnimationTarget
		import androidx.compose.foundation.layout.offset
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.safeDrawing
		import androidx.compose.foundation.layout.systemBars
		@@ -68,11 +66,13 @@ import androidx.compose.ui.geometry.Rect
		import androidx.compose.ui.graphics.BlendMode
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.graphics.toAndroidRectF
		import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
		import androidx.compose.ui.input.nestedscroll.NestedScrollSource
		import androidx.compose.ui.input.nestedscroll.nestedScroll
		import androidx.compose.ui.layout.LayoutCoordinates
		import androidx.compose.ui.layout.boundsInWindow
		import androidx.compose.ui.layout.layout
		import androidx.compose.ui.layout.onGloballyPositioned
		import androidx.compose.ui.layout.onSizeChanged
		import androidx.compose.ui.layout.positionInWindow
		@@ -83,6 +83,7 @@ import androidx.compose.ui.res.dimensionResource
		import androidx.compose.ui.unit.Dp
		import androidx.compose.ui.unit.IntOffset
		import androidx.compose.ui.unit.Velocity
		import androidx.compose.ui.unit.constrainHeight
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.util.lerp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		@@ -126,7 +127,6 @@ object Notifications {
		val NotificationStackPlaceholder = ElementKey("NotificationStackPlaceholder")
		val HeadsUpNotificationPlaceholder =
		ElementKey("HeadsUpNotificationPlaceholder", contentPicker = LowestZIndexContentPicker)
		val NotificationStackCutoffGuideline = ElementKey("NotificationStackCutoffGuideline")
		}
		}

		@@ -257,7 +257,14 @@ fun ContentScope.ConstrainedNotificationStack(
		) {
		Box(
		modifier =
		modifier.onSizeChanged { viewModel.onConstrainedAvailableSpaceChanged(it.height) }
		modifier
		.onSizeChanged { viewModel.onConstrainedAvailableSpaceChanged(it.height) }
		.onGloballyPositioned {
		if (shouldUseLockscreenStackBounds(layoutState.transitionState)) {
		// TODO(417965077) correct drawBounds for the horizontal padding of the NSSL
		stackScrollView.setDrawBounds(it.boundsInWindow().toAndroidRectF())
		}
		}
		) {
		NotificationPlaceholder(
		stackScrollView = stackScrollView,
		@@ -283,11 +290,6 @@ fun ContentScope.ConstrainedNotificationStack(
		},
		modifier = Modifier.align(Alignment.TopCenter),
		)
		NotificationStackCutoffGuideline(
		stackScrollView = stackScrollView,
		viewModel = viewModel,
		modifier = Modifier.align(Alignment.BottomCenter),
		)
		}
		}

		@@ -548,35 +550,33 @@ fun ContentScope.NotificationScrollingStack(
		modifier
		.element(Notifications.Elements.NotificationScrim)
		.overscroll(verticalOverscrollEffect)
		.offset {
		// if scrim is expanded while transitioning to Gone or QS scene, increase the
		// offset in step with the corresponding transition so that it is 0 when it
		// completes.
		if (
		scrimOffset.value < 0 &&
		(layoutState.isTransitioning(
		from = viewModel.notificationsShadeContentKey,
		to = Scenes.Gone,
		) \|\|
		layoutState.isTransitioning(
		from = viewModel.notificationsShadeContentKey,
		to = Scenes.Lockscreen,
		))
		) {
		IntOffset(x = 0, y = (scrimOffset.value * expansionFraction).roundToInt())
		} else if (
		scrimOffset.value < 0 &&
		layoutState.isTransitioning(
		from = Scenes.Shade,
		to = Scenes.QuickSettings,
		.thenIf(supportNestedScrolling) {
		Modifier.layout { measurable, constraints ->
		// Adjust the ScrimOffset during layout transitions.
		val yOffset =
		calculateScrimOffset(
		scrimOffset,
		viewModel,
		expansionFraction,
		shadeToQsFraction,
		)
		) {
		IntOffset(
		x = 0,
		y = (scrimOffset.value * (1 - shadeToQsFraction)).roundToInt(),
		// Shrink the scrim height by the amount it is translated down, but still
		// respect the original constraints to support shared element transitions.
		val constrainedHeight =
		constraints.constrainHeight(
		(constraints.maxHeight + minScrimOffset().roundToInt() - yOffset)
		)
		} else {
		IntOffset(x = 0, y = scrimOffset.value.roundToInt())
		val placeable =
		measurable.measure(
		constraints =
		constraints.copy(
		minHeight = constrainedHeight,
		maxHeight = constrainedHeight,
		)
		)
		layout(width = placeable.width, height = placeable.height) {
		placeable.place(IntOffset(x = 0, y = yOffset))
		}
		}
		}
		.graphicsLayer {
		@@ -616,27 +616,27 @@ fun ContentScope.NotificationScrollingStack(
		) {
		Spacer(
		modifier =
		Modifier.thenIf(shouldFillMaxSize) {
		Modifier.fillMaxSize()
		}
		.drawBehind {
		drawRect(Color.Black, blendMode = BlendMode.DstOut)
		}
		Modifier.thenIf(shouldFillMaxSize) { Modifier.fillMaxSize() }
		.drawBehind { drawRect(Color.Black, blendMode = BlendMode.DstOut) }
		)
		Box(
		modifier =
		Modifier.graphicsLayer {
		alpha =
		(expansionFraction / EXPANSION_FOR_MAX_SCRIM_ALPHA).coerceAtMost(1f)
		}
		.thenIf(shouldShowScrim) {
		Modifier.background(surfaceEffect0Color)
		}
		.thenIf(shouldFillMaxSize) {
		Modifier.fillMaxSize()
		alpha = (expansionFraction / EXPANSION_FOR_MAX_SCRIM_ALPHA).coerceAtMost(1f)
		}
		.thenIf(shouldShowScrim) { Modifier.background(surfaceEffect0Color) }
		.thenIf(shouldFillMaxSize) { Modifier.fillMaxSize() }
		.padding(
		top = stackTopPadding,
		bottom =
		if (supportNestedScrolling) minScrimTop + stackBottomPadding
		else stackBottomPadding,
		)
		.onGloballyPositioned {
		if (!shouldUseLockscreenStackBounds(layoutState.transitionState)) {
		// TODO(417965077) correct for the horizontal padding of the NSSL
		stackScrollView.setDrawBounds(it.boundsInWindow().toAndroidRectF())
		}
		.thenIf(supportNestedScrolling) {
		Modifier.padding(bottom = minScrimTop)
		}
		.debugBackground(viewModel, DEBUG_BOX_COLOR)
		) {
		@@ -648,7 +648,6 @@ fun ContentScope.NotificationScrollingStack(
		Modifier.nestedScroll(scrimNestedScrollConnection)
		}
		.verticalScroll(scrollState, overscrollEffect = overScrollEffect)
		.padding(top = stackTopPadding, bottom = stackBottomPadding)
		.fillMaxWidth()
		.onGloballyPositioned { coordinates ->
		stackBoundsOnScreen.value = coordinates.boundsInWindow()
		@@ -692,27 +691,36 @@ fun ContentScope.NotificationScrollingStack(
		}

		/**
		* A 0 height horizontal spacer to be placed at the bottom-most position in the current scene, where
		* the notification contents (stack, footer, shelf) should be drawn.
		* Calculate the correct NotificationScrim offset during layout transitions.
		*
		* If scrim is expanded while transitioning to Gone or QS scene, increase the offset in step with
		* the corresponding transition so that it is 0 when it completes.
		*/
		@Composable
		fun ContentScope.NotificationStackCutoffGuideline(
		stackScrollView: NotificationScrollView,
		private fun ContentScope.calculateScrimOffset(
		scrimOffset: Animatable<Float, AnimationVector1D>,
		viewModel: NotificationsPlaceholderViewModel,
		modifier: Modifier = Modifier,
		expansionFraction: Float,
		shadeToQsFraction: Float,
		) =
		if (
		scrimOffset.value < 0 &&
		(layoutState.isTransitioning(
		from = viewModel.notificationsShadeContentKey,
		to = Scenes.Gone,
		) \|\|
		layoutState.isTransitioning(
		from = viewModel.notificationsShadeContentKey,
		to = Scenes.Lockscreen,
		))
		) {
		Spacer(
		modifier =
		modifier
		.element(key = Notifications.Elements.NotificationStackCutoffGuideline)
		.fillMaxWidth()
		.height(0.dp)
		.onGloballyPositioned { coordinates ->
		val positionY = coordinates.positionInWindow().y
		debugLog(viewModel) { "STACK cutoff onGloballyPositioned: y=$positionY" }
		stackScrollView.setStackCutoff(positionY)
		}
		)
		(scrimOffset.value * expansionFraction).roundToInt()
		} else if (
		scrimOffset.value < 0 &&
		layoutState.isTransitioning(from = Scenes.Shade, to = Scenes.QuickSettings)
		) {
		(scrimOffset.value * (1 - shadeToQsFraction)).roundToInt()
		} else {
		scrimOffset.value.roundToInt()
		}

		@Composable

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -165,14 +165,6 @@ constructor(
		modifier = Modifier.fillMaxWidth(),
		)
		}
		// Communicates the bottom position of the drawable area within the shade to NSSL.
		NotificationStackCutoffGuideline(
		stackScrollView = stackScrollView.get(),
		viewModel = placeholderViewModel,
		modifier =
		Modifier.align(Alignment.BottomCenter)
		.padding(bottom = notificationStackPadding),
		)
		}
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+0 −15

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.EXPA
		import com.android.systemui.media.dagger.MediaModule
		import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		import com.android.systemui.notifications.ui.composable.NotificationStackCutoffGuideline
		import com.android.systemui.qs.composefragment.ui.GridAnchor
		import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.panels.ui.compose.TileGrid
		@@ -466,20 +465,6 @@ private fun ContentScope.QuickSettingsScene(
		.offset { IntOffset(x = 0, y = minNotificationStackTop) }
		.padding(horizontal = shadeHorizontalPadding),
		)
		NotificationStackCutoffGuideline(
		stackScrollView = notificationStackScrollView,
		viewModel = notificationsPlaceholderViewModel,
		modifier =
		Modifier.align(Alignment.BottomCenter)
		.navigationBarsPadding()
		.offset { IntOffset(x = 0, y = minNotificationStackTop) }
		.padding(
		start = shadeHorizontalPadding,
		top = 0.dp,
		end = shadeHorizontalPadding,
		bottom = navBarBottomHeight,
		),
		)
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.scene.ui.composable

		import android.graphics.RectF
		import androidx.compose.foundation.layout.Spacer
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.runtime.Composable
		@@ -91,7 +92,7 @@ constructor(
		notificationStackScrolLView.get().apply {
		// use -headsUpInset to allow HUN translation outside bounds for snoozing
		setStackTop(-headsUpInset)
		setStackCutoff(0f)
		setDrawBounds(RectF())
		}
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+1 −15

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.EXPA
		import com.android.systemui.media.dagger.MediaModule.QS_PANEL
		import com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		import com.android.systemui.notifications.ui.composable.NotificationStackCutoffGuideline
		import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.panels.ui.compose.QuickQuickSettings
		import com.android.systemui.qs.ui.composable.BrightnessMirror
		@@ -393,15 +392,9 @@ private fun ContentScope.SingleShade(
		.height(navBarHeight)
		// Intercepts touches, prevents the scrollable container behind from scrolling.
		.clickable(interactionSource = null, indication = null) { /* do nothing */ }
		) {
		NotificationStackCutoffGuideline(
		stackScrollView = notificationStackScrollView,
		viewModel = notificationsPlaceholderViewModel,
		modifier = Modifier.align(Alignment.TopCenter),
		)
		}
		}
		}

		@Composable
		private fun ContentScope.SplitShade(
		@@ -607,13 +600,6 @@ private fun ContentScope.SplitShade(
		)
		}
		}
		NotificationStackCutoffGuideline(
		stackScrollView = notificationStackScrollView,
		viewModel = notificationsPlaceholderViewModel,
		modifier =
		Modifier.align(Alignment.BottomCenter)
		.padding(bottom = notificationStackPadding + navBarBottomHeight),
		)
		}
		}