Merge "Remove WindowInsets in TopAppBar" into main (62041833) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -856,7 +856,8 @@ constructor(
		modifier =
		modifier
		.fillMaxWidth()
		.padding(horizontal = { QuickSettingsShade.Dimensions.Padding.roundToPx() }),
		.padding(horizontal = { QuickSettingsShade.Dimensions.Padding.roundToPx() })
		.padding(top = { viewModel.qqsHeaderHeight }),
		)
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import androidx.compose.foundation.layout.heightIn
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.requiredHeightIn
		import androidx.compose.foundation.layout.size
		import androidx.compose.foundation.layout.statusBarsPadding
		import androidx.compose.foundation.layout.systemBars
		import androidx.compose.foundation.layout.windowInsetsBottomHeight
		import androidx.compose.foundation.layout.wrapContentHeight
		@@ -192,6 +193,7 @@ object TileType
		@Composable
		private fun EditModeTopBar(
		onStopEditing: () -> Unit,
		modifier: Modifier = Modifier,
		actions: @Composable RowScope.() -> Unit = {},
		) {
		val surfaceEffect2 = LocalAndroidColorScheme.current.surfaceEffect2
		@@ -222,7 +224,8 @@ private fun EditModeTopBar(
		}
		},
		actions = actions,
		modifier = Modifier.padding(vertical = 8.dp),
		modifier = modifier.padding(vertical = 8.dp),
		windowInsets = WindowInsets(0.dp),
		)
		}

		@@ -264,7 +267,7 @@ fun DefaultEditTileGrid(
		Scaffold(
		containerColor = Color.Transparent,
		topBar = {
		EditModeTopBar(onStopEditing = onStopEditing) {
		EditModeTopBar(onStopEditing = onStopEditing, modifier = Modifier.statusBarsPadding()) {
		AnimatedVisibility(snapshotViewModel.canUndo, enter = fadeIn(), exit = fadeOut()) {
		TextButton(
		enabled = snapshotViewModel.canUndo,