Lower Material XR minSdk to 24 Test: Sample app works on an API 29 phone Fixes: 385227563 Relnote: Lower Material XR minSdk to 24 Change-Id: I0a82f1a8ee68c075e029e230bbfc4ac7d09b7070
diff --git a/xr/compose/material3/integration-tests/testapp/build.gradle b/xr/compose/material3/integration-tests/testapp/build.gradle index 86585ec..37b16df 100644 --- a/xr/compose/material3/integration-tests/testapp/build.gradle +++ b/xr/compose/material3/integration-tests/testapp/build.gradle
@@ -56,7 +56,7 @@ android { compileSdk = 35 defaultConfig { - minSdk = 34 + minSdk = 24 } namespace = "androidx.xr.compose.material3.integration.testapp" buildTypes {
diff --git a/xr/compose/material3/material3/build.gradle b/xr/compose/material3/material3/build.gradle index 2920d1b..422d521 100644 --- a/xr/compose/material3/material3/build.gradle +++ b/xr/compose/material3/material3/build.gradle
@@ -47,7 +47,7 @@ android { compileSdk = 35 defaultConfig { - minSdk = 34 + minSdk = 24 } namespace = "androidx.xr.compose.material3" }
diff --git a/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/EnableXrComponentOverrides.kt b/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/EnableXrComponentOverrides.kt index 276fc4f..ba50038 100644 --- a/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/EnableXrComponentOverrides.kt +++ b/xr/compose/material3/material3/src/main/java/androidx/xr/compose/material3/EnableXrComponentOverrides.kt
@@ -16,6 +16,7 @@ package androidx.xr.compose.material3 +import android.os.Build import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ComponentOverrideApi import androidx.compose.material3.LocalBasicAlertDialogOverride @@ -49,6 +50,10 @@ overrideEnabler: XrComponentOverrideEnabler = DefaultXrComponentOverrideEnabler, content: @Composable () -> Unit, ) { + if (Build.VERSION.SDK_INT < 34) { + content() + return + } val context = XrComponentOverrideEnablerContextImpl // Override CompositionLocals for all ComponentOverrides, as specified by the provided enabler.