Merge "[Flexiglass] Add NotificationStackCutoffGuideline to the QuickSettings" into main (aad7d7ca) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.navigationBars
		import androidx.compose.foundation.layout.navigationBarsPadding
		import androidx.compose.foundation.layout.offset
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.wrapContentHeight
		@@ -85,6 +86,7 @@ import com.android.systemui.media.controls.ui.view.MediaHost
		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.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.InQS
		@@ -416,5 +418,13 @@ private fun SceneScope.QuickSettingsScene(
		modifier =
		Modifier.fillMaxWidth().offset { IntOffset(x = 0, y = screenHeight.roundToInt()) },
		)
		NotificationStackCutoffGuideline(
		stackScrollView = notificationStackScrollView,
		viewModel = viewModel.notifications,
		modifier =
		Modifier.align(Alignment.BottomCenter).navigationBarsPadding().offset {
		IntOffset(x = 0, y = screenHeight.roundToInt())
		}
		)
		}
		}