Merge branch 'xr-alpha04' of https://github.com/android/snippets into xr-alpha04

Author: jkleinert

xr/src/main/java/com/example/xr/compose/Subspace.kt

@@ -22,6 +22,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Row
 import androidx.compose.runtime.Composable
+import androidx.xr.compose.spatial.ApplicationSubspace
 import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.SpatialPanel
 
@@ -32,7 +33,7 @@ private class SubspaceActivity : ComponentActivity() {
         // [START androidxr_compose_SubspaceSetContent]
         setContent {
             // This is a top-level subspace
-            Subspace {
+            ApplicationSubspace {
                 SpatialPanel {
                     MyComposable()
                 }

xr/src/main/java/com/example/xr/scenecore/Environments.kt

@@ -33,14 +33,14 @@ private class Environments(val session: Session) {
 
     fun loadEnvironmentSkybox() {
         // [START androidxr_scenecore_environment_loadEnvironmentSkybox]
-        val skybox = ExrImage.create(session, "BlueSkybox.exr")
+        val lightingForSkybox = ExrImage.create(session, "BlueSkyboxLighting.zip")
         // [END androidxr_scenecore_environment_loadEnvironmentSkybox]
     }
 
-    fun setEnvironmentPreference(environmentGeometry: GltfModel, skybox: ExrImage) {
+    fun setEnvironmentPreference(environmentGeometry: GltfModel, lightingForSkybox: ExrImage) {
         // [START androidxr_scenecore_environment_setEnvironmentPreference]
         val spatialEnvironmentPreference =
-            SpatialEnvironment.SpatialEnvironmentPreference(skybox, environmentGeometry)
+            SpatialEnvironment.SpatialEnvironmentPreference(lightingForSkybox, environmentGeometry)
         val preferenceResult =
             session.scene.spatialEnvironment.setSpatialEnvironmentPreference(spatialEnvironmentPreference)
         if (preferenceResult == SpatialEnvironment.SetSpatialEnvironmentPreferenceChangeApplied()) {