Migrate to snapshot 13623196 (alpha05)

Author: devbridie

gradle/libs.versions.toml

@@ -63,9 +63,9 @@ playServicesWearable = "19.0.0"
 protolayout = "1.3.0-beta02"
 recyclerview = "1.4.0"
 # @keep
-androidx-xr-arcore = "1.0.0-alpha04"
-androidx-xr-scenecore = "1.0.0-alpha04"
-androidx-xr-compose = "1.0.0-alpha04"
+androidx-xr-arcore = "1.0.0-SNAPSHOT"
+androidx-xr-scenecore = "1.0.0-SNAPSHOT"
+androidx-xr-compose = "1.0.0-SNAPSHOT"
 targetSdk = "34"
 tiles = "1.5.0-beta01"
 version-catalog-update = "1.0.0"

settings.gradle.kts

@@ -1,4 +1,4 @@
-val snapshotVersion : String? = System.getenv("COMPOSE_SNAPSHOT_ID")
+val snapshotVersion : String? = "13623196"
 
 pluginManagement {
     repositories {

xr/build.gradle.kts

@@ -28,9 +28,17 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.xr.arcore)
-    implementation(libs.androidx.xr.scenecore)
-    implementation(libs.androidx.xr.compose)
+    implementation(libs.androidx.xr.arcore)  {
+        exclude(module = "impress")
+    }
+    implementation(libs.androidx.xr.scenecore)  {
+        exclude(module = "impress")
+    }
+    implementation(libs.androidx.xr.compose)  {
+        exclude(module = "impress")
+    }
+
+    implementation("com.google.ar:impress:0.0.3")
 
     implementation(libs.androidx.activity.ktx)
     implementation(libs.guava)

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

@@ -29,18 +29,19 @@ import androidx.xr.scenecore.AnchorEntity
 import androidx.xr.scenecore.Entity
 import androidx.xr.scenecore.scene
 
-@Suppress("RestrictedApi") // b/416288516 - session.config and session.configure() are incorrectly restricted
 fun configureAnchoring(session: Session) {
     // [START androidxr_arcore_anchoring_configure]
     val newConfig = session.config.copy(
-        anchorPersistence = Config.AnchorPersistenceMode.Enabled,
+        anchorPersistence = Config.AnchorPersistenceMode.LOCAL,
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureConfigurationNotSupported ->
             TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         is SessionConfigurePermissionsNotGranted ->
             TODO(/* The required permissions in result.permissions have not been granted. */)
         is SessionConfigureSuccess -> TODO(/* Success! */)
+        else ->
+            TODO(/* A different unhandled exception was thrown. */)
     }
     // [END androidxr_arcore_anchoring_configure]
 }
@@ -65,14 +66,15 @@ private fun createAnchorAtTrackable(trackable: Trackable<*>) {
     // [END androidxr_arcore_anchor_create_trackable]
 }
 
+@Suppress("RestrictedApi") // b/422174724
 private fun attachEntityToAnchor(
     session: Session,
     entity: Entity,
     anchor: Anchor
 ) {
     // [START androidxr_arcore_entity_tracks_anchor]
     AnchorEntity.create(session, anchor).apply {
-        setParent(session.scene.activitySpace)
+        parent = session.scene.activitySpace
         addChild(entity)
     }
     // [END androidxr_arcore_entity_tracks_anchor]

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

@@ -35,18 +35,19 @@ import androidx.xr.scenecore.scene
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 
-@Suppress("RestrictedApi") // b/416288516 - session.config and session.configure() are incorrectly restricted
 fun ComponentActivity.configureSession(session: Session) {
     // [START androidxr_arcore_hand_configure]
     val newConfig = session.config.copy(
-        handTracking = Config.HandTrackingMode.Enabled
+        handTracking = Config.HandTrackingMode.BOTH
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureConfigurationNotSupported ->
             TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         is SessionConfigurePermissionsNotGranted ->
             TODO(/* The required permissions in result.permissions have not been granted. */)
         is SessionConfigureSuccess -> TODO(/* Success! */)
+        else ->
+            TODO(/* A different unhandled exception was thrown. */)
     }
     // [END androidxr_arcore_hand_configure]
 }
@@ -71,13 +72,14 @@ fun ComponentActivity.collectHands(session: Session) {
 fun secondaryHandDetection(activity: Activity, session: Session) {
     fun detectGesture(handState: Flow<Hand.State>) {}
     // [START androidxr_arcore_hand_handedness]
-    val handedness = Hand.getHandedness(activity.contentResolver)
-    val secondaryHand = if (handedness == Hand.Handedness.LEFT) Hand.right(session) else Hand.left(session)
+    val handedness = Hand.getPrimaryHandSide(activity.contentResolver)
+    val secondaryHand = if (handedness == Hand.HandSide.LEFT) Hand.right(session) else Hand.left(session)
     val handState = secondaryHand?.state ?: return
     detectGesture(handState)
     // [END androidxr_arcore_hand_handedness]
 }
 
+@Suppress("RestrictedApi") // b/416066566
 fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
     val session: Session = null!!
     val palmEntity: GltfModelEntity = null!!
@@ -86,7 +88,7 @@ fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
 
     // the down direction points in the same direction as the palm
     val angle = Vector3.angleBetween(palmPose.rotation * Vector3.Down, Vector3.Up)
-    palmEntity.setHidden(angle > Math.toRadians(40.0))
+    palmEntity.setEnabled(angle > Math.toRadians(40.0))
 
     val transformedPose =
         session.scene.perceptionSpace.transformPoseTo(
@@ -98,6 +100,7 @@ fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
     // [END androidxr_arcore_hand_entityAtHandPalm]
 }
 
+@Suppress("RestrictedApi") // b/416066566
 fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {
     val session: Session = null!!
     val indexFingerEntity: GltfModelEntity = null!!
@@ -107,7 +110,7 @@ fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {
 
     // the forward direction points towards the finger tip.
     val angle = Vector3.angleBetween(tipPose.rotation * Vector3.Forward, Vector3.Up)
-    indexFingerEntity.setHidden(angle > Math.toRadians(40.0))
+    indexFingerEntity.setEnabled(angle > Math.toRadians(40.0))
 
     val transformedPose =
         session.scene.perceptionSpace.transformPoseTo(
@@ -120,6 +123,7 @@ fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {
     // [END androidxr_arcore_hand_entityAtIndexFingerTip]
 }
 
+@Suppress("RestrictedApi") // b/416066566
 private fun detectPinch(session: Session, handState: Hand.State): Boolean {
     // [START androidxr_arcore_hand_pinch_gesture]
     val thumbTip = handState.handJoints[HandJointType.THUMB_TIP] ?: return false

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

@@ -26,18 +26,19 @@ import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Ray
 import androidx.xr.scenecore.scene
 
-@Suppress("RestrictedApi") // b/416288516 - session.config and session.configure() are incorrectly restricted
 fun configurePlaneTracking(session: Session) {
     // [START androidxr_arcore_planetracking_configure]
     val newConfig = session.config.copy(
-        planeTracking = Config.PlaneTrackingMode.HorizontalAndVertical,
+        planeTracking = Config.PlaneTrackingMode.HORIZONTAL_AND_VERTICAL,
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureConfigurationNotSupported ->
             TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         is SessionConfigurePermissionsNotGranted ->
             TODO(/* The required permissions in result.permissions have not been granted. */)
         is SessionConfigureSuccess -> TODO(/* Success! */)
+        else ->
+            TODO(/* A different unhandled exception was thrown. */)
     }
     // [END androidxr_arcore_planetracking_configure]
 }
@@ -50,6 +51,7 @@ private suspend fun subscribePlanes(session: Session) {
     // [END androidxr_arcore_planes_subscribe]
 }
 
+@Suppress("RestrictedApi") // b/416066566
 private fun hitTestTable(session: Session) {
     val pose = session.scene.spatialUser.head?.transformPoseTo(Pose(), session.scene.perceptionSpace) ?: return
     val ray = Ray(pose.translation, pose.forward)
@@ -58,7 +60,7 @@ private fun hitTestTable(session: Session) {
     // When interested in the first Table hit:
     val tableHit = results.firstOrNull {
         val trackable = it.trackable
-        trackable is Plane && trackable.state.value.label == Plane.Label.Table
+        trackable is Plane && trackable.state.value.label == Plane.Label.TABLE
     }
     // [END androidxr_arcore_hitTest]
 }

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

@@ -25,8 +25,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -36,9 +36,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.xr.compose.spatial.EdgeOffset
+import androidx.xr.compose.spatial.ContentEdge
 import androidx.xr.compose.spatial.Orbiter
-import androidx.xr.compose.spatial.OrbiterEdge
+import androidx.xr.compose.spatial.OrbiterOffsetType
 import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.SpatialRow
@@ -50,6 +50,7 @@ import androidx.xr.compose.subspace.layout.resizable
 import androidx.xr.compose.subspace.layout.width
 import com.example.xr.R
 
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun OrbiterExampleSubspace() {
     // [START androidxr_compose_OrbiterExampleSubspace]
@@ -72,7 +73,7 @@ private fun OrbiterExampleSubspace() {
 @Composable
 fun OrbiterExample() {
     Orbiter(
-        position = OrbiterEdge.Bottom,
+        position = ContentEdge.Bottom,
         offset = 96.dp,
         alignment = Alignment.CenterHorizontally
     ) {
@@ -97,18 +98,20 @@ fun OrbiterExample() {
 // [END androidxr_compose_OrbiterExample]
 
 @Composable
+@Suppress("RestrictedApi") // b/416066566
 fun OrbiterAnchoringExample() {
     // [START androidxr_compose_OrbiterAnchoringExample]
     Subspace {
         SpatialRow {
             Orbiter(
-                position = OrbiterEdge.Top,
-                offset = EdgeOffset.inner(8.dp),
+                position = ContentEdge.Top,
+                offset = 8.dp,
+                offsetType = OrbiterOffsetType.InnerEdge,
                 shape = SpatialRoundedCornerShape(size = CornerSize(50))
             ) {
                 Text(
                     "Hello World!",
-                    style = MaterialTheme.typography.h2,
+                    style = MaterialTheme.typography.titleMedium,
                     modifier = Modifier
                         .background(Color.White)
                         .padding(16.dp)
@@ -150,7 +153,7 @@ private fun Ui2DToOribiter() {
 
     // New XR differentiated approach
     Orbiter(
-        position = OrbiterEdge.Start,
+        position = ContentEdge.Start,
         offset = dimensionResource(R.dimen.start_orbiter_padding),
         alignment = Alignment.Top
     ) {

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

@@ -45,6 +45,7 @@ private fun SpatialCapabilitiesCheck() {
     // [END androidxr_compose_checkSpatialCapabilities]
 }
 
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun checkSpatialUiEnabled() {
     // [START androidxr_compose_checkSpatialUiEnabled]

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

@@ -27,7 +27,7 @@ private fun ComposableThatShouldElevateInXr() {}
 private fun SpatialElevationExample() {
     // [START androidxr_compose_spatialelevation]
     // Elevate an otherwise 2D Composable (signified here by ComposableThatShouldElevateInXr).
-    SpatialElevation(spatialElevationLevel = SpatialElevationLevel.Level4) {
+    SpatialElevation(elevation = SpatialElevationLevel.Level4) {
         ComposableThatShouldElevateInXr()
     }
     // [END androidxr_compose_spatialelevation]

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

@@ -19,6 +19,7 @@ package com.example.xr.compose
 import android.content.ContentResolver
 import android.net.Uri
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ExperimentalComposeApi
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
@@ -32,6 +33,8 @@ import androidx.xr.compose.subspace.layout.height
 import androidx.xr.compose.subspace.layout.width
 
 // [START androidxr_compose_SpatialExternalSurfaceStereo]
+@OptIn(ExperimentalComposeApi::class)
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 fun SpatialExternalSurfaceContent() {
     val context = LocalContext.current

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

@@ -36,6 +36,7 @@ import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.height
 import androidx.xr.compose.subspace.layout.width
 
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun SpatialLayoutExampleSubspace() {
     // [START androidxr_compose_SpatialLayoutExampleSubspace]

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

@@ -36,6 +36,7 @@ import androidx.xr.compose.subspace.layout.movable
 import androidx.xr.compose.subspace.layout.resizable
 import androidx.xr.compose.subspace.layout.width
 
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun SpatialPanelExample() {
     // [START androidxr_compose_SpatialPanel]
@@ -75,6 +76,7 @@ fun SpatialPanelContent() {
 @Composable
 private fun AppContent() {}
 
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun ContentInSpatialPanel() {
     // [START androidxr_compose_SpatialPanelAppContent]

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

@@ -24,6 +24,7 @@ import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.height
 import androidx.xr.compose.subspace.layout.width
 
+@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun SpatialRowExample() {
     // [START androidxr_compose_SpatialRowExample]

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

@@ -26,6 +26,7 @@ import androidx.xr.compose.spatial.ApplicationSubspace
 import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.SpatialPanel
 
+@Suppress("RestrictedApi") // b/416066566
 private class SubspaceActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

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

@@ -22,37 +22,42 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
 import androidx.compose.material3.Text
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.Fragment
-import androidx.xr.compose.platform.setSubspaceContent
+import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.depth
 import androidx.xr.compose.subspace.layout.height
 import androidx.xr.compose.subspace.layout.width
 import androidx.xr.runtime.Session
+import androidx.xr.runtime.math.IntSize2d
 import androidx.xr.scenecore.PanelEntity
-import androidx.xr.scenecore.PixelDimensions
 import com.example.xr.R
 
 private class MyCustomView(context: Context) : View(context)
 
 private class ActivityWithSubspaceContent : ComponentActivity() {
+    @Suppress("RestrictedApi") // b/416066566
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         // [START androidxr_compose_ActivityWithSubspaceContent]
-        setSubspaceContent {
-            SpatialPanel(
-                modifier = SubspaceModifier.height(500.dp).width(500.dp).depth(25.dp)
-            ) { MyCustomView(this) }
+        setContent {
+            Subspace {
+                SpatialPanel(
+                    modifier = SubspaceModifier.height(500.dp).width(500.dp).depth(25.dp)
+                ) { MyCustomView(this@ActivityWithSubspaceContent) }
+            }
         }
         // [END androidxr_compose_ActivityWithSubspaceContent]
     }
 }
 
+@Suppress("RestrictedApi") // b/416066566
 private class FragmentWithComposeView() : Fragment() {
     // [START androidxr_compose_FragmentWithComposeView]
     override fun onCreateView(
@@ -83,7 +88,7 @@ fun ComponentActivity.PanelEntityWithView(xrSession: Session) {
     val panelEntity = PanelEntity.create(
         session = xrSession,
         view = panelContent,
-        pixelDimensions = PixelDimensions(500, 500),
+        pixelDimensions = IntSize2d(500, 500),
         name = "panel entity"
     )
     // [END androidxr_compose_PanelEntityWithView]