Merge "Screen Capture: Add elevation shadow to toolbar" into main (4cb20f20) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screencapture/ui/compose/Toolbar.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@ import androidx.compose.material3.MaterialTheme
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.unit.Dp
		import androidx.compose.ui.unit.dp
		import com.android.compose.PlatformIconButton
		import com.android.systemui.res.R

		@@ -38,6 +40,7 @@ fun Toolbar(
		onCloseClick: () -> Unit,
		modifier: Modifier = Modifier,
		colors: FloatingToolbarColors = defaultColors(),
		elevation: Dp = 2.dp,
		content: @Composable RowScope.() -> Unit,
		) {
		HorizontalFloatingToolbar(
		@@ -45,6 +48,7 @@ fun Toolbar(
		modifier = modifier,
		colors = colors,
		shape = FloatingToolbarDefaults.ContainerShape,
		expandedShadowElevation = elevation,
		leadingContent = {
		PlatformIconButton(
		iconResource = R.drawable.ic_close,