diff options
| author | 2024-06-18 07:32:46 +0000 | |
|---|---|---|
| committer | 2024-06-18 07:32:46 +0000 | |
| commit | aad7d7caba4d57d2e776dc695ec207df41852cc9 (patch) | |
| tree | 43577a4d744f9e61d5162e499a4c2fc269ad31cd | |
| parent | 8dfcf9d72cf10183ed21f72b6d74e074cfc16be0 (diff) | |
| parent | 4eb961f36c78e5a546733b29e62fe508aa03d8d2 (diff) | |
Merge "[Flexiglass] Add NotificationStackCutoffGuideline to the QuickSettings" into main
| -rw-r--r-- | packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt index 644040db7c8e..0b57151e971d 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt @@ -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()) + } + ) } } |