From 805753e27e1418dd86ab25f17b4e8809b4eecaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dereck=20Bridi=C3=A9?= Date: Mon, 23 Feb 2026 15:57:59 +0100 Subject: [PATCH 1/2] Sync to snapshot 14888432 --- gradle.properties | 2 +- xr/build.gradle.kts | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7f3ce3932..4fa4d93c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,4 +32,4 @@ android.enableR8.fullMode=true android.newDsl=false # Use an AndroidX snapshot build. # https://androidx.dev/snapshots/builds -# snapshotVersion=14793336 \ No newline at end of file +snapshotVersion=14888432 \ No newline at end of file diff --git a/xr/build.gradle.kts b/xr/build.gradle.kts index a94d6bdda..03f344c84 100644 --- a/xr/build.gradle.kts +++ b/xr/build.gradle.kts @@ -29,12 +29,20 @@ android { } } +val useSnapshot = providers.gradleProperty("snapshotVersion").orNull != null dependencies { - implementation(libs.androidx.xr.arcore) - implementation(libs.androidx.arcore.play.services) + if (useSnapshot) { + snapshotImplementation(libs.androidx.xr.arcore) + snapshotImplementation(libs.androidx.arcore.play.services) + snapshotImplementation(libs.androidx.xr.scenecore) + snapshotImplementation(libs.androidx.xr.compose) + } else { + implementation(libs.androidx.xr.arcore) + implementation(libs.androidx.arcore.play.services) + implementation(libs.androidx.xr.scenecore) + implementation(libs.androidx.xr.compose) + } implementation(libs.google.ar.core) - implementation(libs.androidx.xr.scenecore) - implementation(libs.androidx.xr.compose) implementation(libs.androidx.activity.ktx) @@ -70,3 +78,10 @@ dependencies { implementation(libs.androidx.activity.compose) implementation(libs.androidx.appcompat) } + +fun DependencyHandler.snapshotImplementation(dependencyNotation: Provider) { + val shim = dependencyNotation.get() + implementation("${shim.group}:${shim.name}:1.0.0-SNAPSHOT") { + exclude(module = "impress") + } +} \ No newline at end of file From 9edd45bdb340b4b502ce6ee1ef7e0cf153ec690d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dereck=20Bridi=C3=A9?= Date: Fri, 30 Jan 2026 15:14:54 -0500 Subject: [PATCH 2/2] Change usages of Config.* symbols --- xr/src/main/java/com/example/xr/arcore/Anchors.kt | 4 ++-- xr/src/main/java/com/example/xr/arcore/DepthMaps.kt | 4 ++-- xr/src/main/java/com/example/xr/arcore/FaceTracking.kt | 4 ++-- xr/src/main/java/com/example/xr/arcore/Hands.kt | 4 ++-- xr/src/main/java/com/example/xr/arcore/Planes.kt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xr/src/main/java/com/example/xr/arcore/Anchors.kt b/xr/src/main/java/com/example/xr/arcore/Anchors.kt index ad8ac26a6..f0338f245 100644 --- a/xr/src/main/java/com/example/xr/arcore/Anchors.kt +++ b/xr/src/main/java/com/example/xr/arcore/Anchors.kt @@ -19,7 +19,7 @@ package com.example.xr.arcore import androidx.xr.arcore.Anchor import androidx.xr.arcore.AnchorCreateSuccess import androidx.xr.arcore.Trackable -import androidx.xr.runtime.Config +import androidx.xr.runtime.AnchorPersistenceMode import androidx.xr.runtime.Session import androidx.xr.runtime.SessionConfigureSuccess import androidx.xr.runtime.math.Pose @@ -30,7 +30,7 @@ import androidx.xr.scenecore.scene fun configureAnchoring(session: Session) { // [START androidxr_arcore_anchoring_configure] val newConfig = session.config.copy( - anchorPersistence = Config.AnchorPersistenceMode.LOCAL, + anchorPersistence = AnchorPersistenceMode.LOCAL, ) when (val result = session.configure(newConfig)) { is SessionConfigureSuccess -> TODO(/* Success! */) diff --git a/xr/src/main/java/com/example/xr/arcore/DepthMaps.kt b/xr/src/main/java/com/example/xr/arcore/DepthMaps.kt index 32ae3eb3a..34628f7f1 100644 --- a/xr/src/main/java/com/example/xr/arcore/DepthMaps.kt +++ b/xr/src/main/java/com/example/xr/arcore/DepthMaps.kt @@ -17,14 +17,14 @@ package com.example.xr.arcore import androidx.xr.arcore.DepthMap -import androidx.xr.runtime.Config +import androidx.xr.runtime.DepthEstimationMode import androidx.xr.runtime.Session import androidx.xr.runtime.SessionConfigureSuccess private fun configureDepthEstimation(session: Session) { // [START androidxr_arcore_depthmaps_configure] val newConfig = session.config.copy( - depthEstimation = Config.DepthEstimationMode.SMOOTH_ONLY, + depthEstimation = DepthEstimationMode.SMOOTH_ONLY, ) when (val result = session.configure(newConfig)) { is SessionConfigureSuccess -> TODO(/* Success! */) diff --git a/xr/src/main/java/com/example/xr/arcore/FaceTracking.kt b/xr/src/main/java/com/example/xr/arcore/FaceTracking.kt index 5dcb55c64..76c65e2b8 100644 --- a/xr/src/main/java/com/example/xr/arcore/FaceTracking.kt +++ b/xr/src/main/java/com/example/xr/arcore/FaceTracking.kt @@ -19,7 +19,7 @@ package com.example.xr.arcore import androidx.xr.arcore.Face import androidx.xr.arcore.FaceBlendShapeType import androidx.xr.arcore.FaceConfidenceRegion -import androidx.xr.runtime.Config +import androidx.xr.runtime.FaceTrackingMode import androidx.xr.runtime.Session import androidx.xr.runtime.SessionConfigureSuccess import androidx.xr.runtime.TrackingState @@ -27,7 +27,7 @@ import androidx.xr.runtime.TrackingState private fun configureFaceTracking(session: Session) { // [START androidxr_arcore_faceTracking_configure] val newConfig = session.config.copy( - faceTracking = Config.FaceTrackingMode.USER, + faceTracking = FaceTrackingMode.BLEND_SHAPES, ) when (val result = session.configure(newConfig)) { is SessionConfigureSuccess -> TODO(/* Success! */) diff --git a/xr/src/main/java/com/example/xr/arcore/Hands.kt b/xr/src/main/java/com/example/xr/arcore/Hands.kt index 3c0fd82fb..f2e7afa48 100644 --- a/xr/src/main/java/com/example/xr/arcore/Hands.kt +++ b/xr/src/main/java/com/example/xr/arcore/Hands.kt @@ -21,7 +21,7 @@ import androidx.activity.ComponentActivity import androidx.lifecycle.lifecycleScope import androidx.xr.arcore.Hand import androidx.xr.arcore.HandJointType -import androidx.xr.runtime.Config +import androidx.xr.runtime.HandTrackingMode import androidx.xr.runtime.Session import androidx.xr.runtime.SessionConfigureSuccess import androidx.xr.runtime.math.Pose @@ -36,7 +36,7 @@ import kotlinx.coroutines.launch fun ComponentActivity.configureSession(session: Session) { // [START androidxr_arcore_hand_configure] val newConfig = session.config.copy( - handTracking = Config.HandTrackingMode.BOTH + handTracking = HandTrackingMode.BOTH ) when (val result = session.configure(newConfig)) { is SessionConfigureSuccess -> TODO(/* Success! */) diff --git a/xr/src/main/java/com/example/xr/arcore/Planes.kt b/xr/src/main/java/com/example/xr/arcore/Planes.kt index ea7e11f1f..3722b34fd 100644 --- a/xr/src/main/java/com/example/xr/arcore/Planes.kt +++ b/xr/src/main/java/com/example/xr/arcore/Planes.kt @@ -18,7 +18,7 @@ package com.example.xr.arcore import androidx.xr.arcore.ArDevice import androidx.xr.arcore.Plane -import androidx.xr.runtime.Config +import androidx.xr.runtime.PlaneTrackingMode import androidx.xr.runtime.Session import androidx.xr.runtime.SessionConfigureSuccess import androidx.xr.runtime.math.Ray @@ -26,7 +26,7 @@ import androidx.xr.runtime.math.Ray fun configurePlaneTracking(session: Session) { // [START androidxr_arcore_planetracking_configure] val newConfig = session.config.copy( - planeTracking = Config.PlaneTrackingMode.HORIZONTAL_AND_VERTICAL, + planeTracking = PlaneTrackingMode.HORIZONTAL_AND_VERTICAL, ) when (val result = session.configure(newConfig)) { is SessionConfigureSuccess -> TODO(/* Success! */)