fix XR dialog not showing some content Fixes: 418062437 Test: manual Relnote: fix XR dialog not showing some content Change-Id: I17cd55c3a6d6dd5b36efb7b3f893b684701cd262
diff --git a/xr/compose/material3/integration-tests/testapp/src/main/java/androidx/xr/compose/material3/integration/testapp/DetailPaneDialog.kt b/xr/compose/material3/integration-tests/testapp/src/main/java/androidx/xr/compose/material3/integration/testapp/DetailPaneDialog.kt index 86dc414..fa7e665 100644 --- a/xr/compose/material3/integration-tests/testapp/src/main/java/androidx/xr/compose/material3/integration/testapp/DetailPaneDialog.kt +++ b/xr/compose/material3/integration-tests/testapp/src/main/java/androidx/xr/compose/material3/integration/testapp/DetailPaneDialog.kt
@@ -65,6 +65,7 @@ DialogWithShowButton("Material Alert Dialog") { showDialog -> AlertDialog( onDismissRequest = { showDialog.value = false }, + title = { Text("AlertDialog") }, text = { Text("This is a Material AlertDialog") }, confirmButton = { Button(
diff --git a/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/BasicAlertDialog.kt b/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/BasicAlertDialog.kt index ab9e53e..03483eb 100644 --- a/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/BasicAlertDialog.kt +++ b/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/BasicAlertDialog.kt
@@ -16,10 +16,14 @@ package androidx.xr.compose.material3 +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.height import androidx.compose.material3.BasicAlertDialogOverride import androidx.compose.material3.BasicAlertDialogOverrideScope import androidx.compose.material3.ExperimentalMaterial3ComponentOverrideApi import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier import androidx.xr.compose.spatial.SpatialDialog import androidx.xr.compose.spatial.SpatialDialogProperties @@ -47,7 +51,9 @@ properties: SpatialDialogProperties = SpatialDialogProperties(), content: @Composable () -> Unit, ) { - SpatialDialog(onDismissRequest = onDismissRequest, properties = properties, content = content) + SpatialDialog(onDismissRequest = onDismissRequest, properties = properties) { + Box(modifier = Modifier.height(IntrinsicSize.Min)) { content() } + } } /**