Update to Jetpack release of January 28

Author: devbridie

gradle/libs.versions.toml

@@ -30,9 +30,9 @@ androidx-window = "1.5.1"
 androidx-window-core = "1.5.1"
 androidx-window-java = "1.5.1"
 androidx-work-runtime = "2.11.0"
-androidx-xr-arcore = "1.0.0-alpha09"
-androidx-xr-compose = "1.0.0-alpha09"
-androidx-xr-scenecore = "1.0.0-alpha10"
+androidx-xr-arcore = "1.0.0-alpha10"
+androidx-xr-compose = "1.0.0-alpha10"
+androidx-xr-scenecore = "1.0.0-alpha11"
 androidxHiltNavigationCompose = "1.3.0"
 appcompat = "1.7.1"
 arcorePlayServices = "1.0.0-alpha09"

settings.gradle.kts

@@ -8,7 +8,7 @@ pluginManagement {
     }
 }
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)

xr/src/main/java/com/example/xr/arcore/Planes.kt

@@ -16,11 +16,11 @@
 
 package com.example.xr.arcore
 
+import androidx.xr.arcore.ArDevice
 import androidx.xr.arcore.Plane
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
 import androidx.xr.runtime.SessionConfigureSuccess
-import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Ray
 import androidx.xr.scenecore.scene
 
@@ -46,8 +46,9 @@ private suspend fun subscribePlanes(session: Session) {
 }
 
 private fun hitTestTable(session: Session) {
-    val pose = session.scene.spatialUser.head?.transformPoseTo(Pose(), session.scene.perceptionSpace) ?: return
-    val ray = Ray(pose.translation, pose.forward)
+    val devicePose = ArDevice.getInstance(session).state.value.devicePose
+    val activitySpacePose = session.scene.perceptionSpace.transformPoseTo(devicePose, session.scene.activitySpace)
+    val ray = Ray(activitySpacePose.translation, activitySpacePose.forward)
     // [START androidxr_arcore_hitTest]
     val results = androidx.xr.arcore.hitTest(session, ray)
     // When interested in the first Table hit:

xr/src/main/java/com/example/xr/misc/ModeTransition.kt

@@ -17,16 +17,17 @@
 package com.example.xr.misc
 
 import androidx.compose.runtime.Composable
-import androidx.xr.compose.platform.LocalSpatialConfiguration
+import androidx.xr.compose.platform.LocalSession
 import androidx.xr.runtime.Session
 import androidx.xr.scenecore.scene
 
 @Composable
 fun modeTransitionCompose() {
     // [START androidxr_misc_modeTransitionCompose]
-    LocalSpatialConfiguration.current.requestHomeSpaceMode()
+    val session = LocalSession.current ?: return
+    session.scene.requestHomeSpaceMode()
     // or
-    LocalSpatialConfiguration.current.requestFullSpaceMode()
+    session.scene.requestFullSpaceMode()
     // [END androidxr_misc_modeTransitionCompose]
 }
 

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

@@ -23,6 +23,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.xr.arcore.ArDevice
 import androidx.xr.runtime.Session
 import androidx.xr.runtime.math.FloatSize2d
 import androidx.xr.runtime.math.Pose
@@ -57,15 +58,15 @@ private fun ComponentActivity.surfaceEntityCreate(xrSession: Session) {
 
 private fun ComponentActivity.surfaceEntityCreateSbs(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreateSbs]
+    val devicePose = ArDevice.getInstance(xrSession).state.value.devicePose
+    val activitySpacePose = xrSession.scene.perceptionSpace.transformPoseTo(devicePose, xrSession.scene.activitySpace)
+
     // Set up the surface for playing a 180° video on a hemisphere.
     val hemisphereStereoSurfaceEntity =
         SurfaceEntity.create(
             session = xrSession,
             stereoMode = SurfaceEntity.StereoMode.SIDE_BY_SIDE,
-            pose = xrSession.scene.spatialUser.head?.transformPoseTo(
-                Pose.Identity,
-                xrSession.scene.activitySpace
-            )!!,
+            pose = activitySpacePose,
             shape = SurfaceEntity.Shape.Hemisphere(1.0f),
         )
     // ... and use the surface for playing the media.
@@ -74,15 +75,14 @@ private fun ComponentActivity.surfaceEntityCreateSbs(xrSession: Session) {
 
 private fun ComponentActivity.surfaceEntityCreateTb(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreateTb]
+    val devicePose = ArDevice.getInstance(xrSession).state.value.devicePose
+    val activitySpacePose = xrSession.scene.perceptionSpace.transformPoseTo(devicePose, xrSession.scene.activitySpace)
     // Set up the surface for playing a 360° video on a sphere.
     val sphereStereoSurfaceEntity =
         SurfaceEntity.create(
             session = xrSession,
             stereoMode = SurfaceEntity.StereoMode.TOP_BOTTOM,
-            pose = xrSession.scene.spatialUser.head?.transformPoseTo(
-                Pose.Identity,
-                xrSession.scene.activitySpace
-            )!!,
+            pose = activitySpacePose,
             shape = SurfaceEntity.Shape.Sphere(1.0f),
         )
     // ... and use the surface for playing the media.