Skip to content

Commit 34dd2e6

Browse files
committed
Update to snapshot 13790637
1 parent 411e7a8 commit 34dd2e6

File tree

7 files changed

+18
-35
lines changed

7 files changed

+18
-35
lines changed

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val snapshotVersion : String? = "13740187"
1+
val snapshotVersion : String? = "13790637"
22

33
pluginManagement {
44
repositories {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.xr.arcore.Trackable
2222
import androidx.xr.runtime.Config
2323
import androidx.xr.runtime.Session
2424
import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
25-
import androidx.xr.runtime.SessionConfigurePermissionsNotGranted
2625
import androidx.xr.runtime.SessionConfigureSuccess
2726
import androidx.xr.runtime.math.Pose
2827
import androidx.xr.scenecore.AnchorEntity
@@ -37,8 +36,6 @@ fun configureAnchoring(session: Session) {
3736
when (val result = session.configure(newConfig)) {
3837
is SessionConfigureConfigurationNotSupported ->
3938
TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
40-
is SessionConfigurePermissionsNotGranted ->
41-
TODO(/* The required permissions in result.permissions have not been granted. */)
4239
is SessionConfigureSuccess -> TODO(/* Success! */)
4340
else ->
4441
TODO(/* A different unhandled exception was thrown. */)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.xr.runtime.Config
2424
import androidx.xr.runtime.HandJointType
2525
import androidx.xr.runtime.Session
2626
import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
27-
import androidx.xr.runtime.SessionConfigurePermissionsNotGranted
2827
import androidx.xr.runtime.SessionConfigureSuccess
2928
import androidx.xr.runtime.math.Pose
3029
import androidx.xr.runtime.math.Quaternion
@@ -43,8 +42,6 @@ fun ComponentActivity.configureSession(session: Session) {
4342
when (val result = session.configure(newConfig)) {
4443
is SessionConfigureConfigurationNotSupported ->
4544
TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
46-
is SessionConfigurePermissionsNotGranted ->
47-
TODO(/* The required permissions in result.permissions have not been granted. */)
4845
is SessionConfigureSuccess -> TODO(/* Success! */)
4946
else ->
5047
TODO(/* A different unhandled exception was thrown. */)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.xr.arcore.Plane
2020
import androidx.xr.runtime.Config
2121
import androidx.xr.runtime.Session
2222
import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
23-
import androidx.xr.runtime.SessionConfigurePermissionsNotGranted
2423
import androidx.xr.runtime.SessionConfigureSuccess
2524
import androidx.xr.runtime.math.Pose
2625
import androidx.xr.runtime.math.Ray
@@ -34,8 +33,6 @@ fun configurePlaneTracking(session: Session) {
3433
when (val result = session.configure(newConfig)) {
3534
is SessionConfigureConfigurationNotSupported ->
3635
TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
37-
is SessionConfigurePermissionsNotGranted ->
38-
TODO(/* The required permissions in result.permissions have not been granted. */)
3936
is SessionConfigureSuccess -> TODO(/* Success! */)
4037
else ->
4138
TODO(/* A different unhandled exception was thrown. */)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ fun DrmSpatialVideoPlayer() {
117117
}
118118
}
119119
}
120-
// [END androidxr_compose_SpatialExternalSurfaceDRM]
120+
// [END androidxr_compose_SpatialExternalSurfaceDRM]

xr/src/main/java/com/example/xr/runtime/Session.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
package com.example.xr.runtime
1818

19-
import android.app.Activity
19+
import androidx.activity.ComponentActivity
2020
import androidx.compose.runtime.Composable
2121
import androidx.xr.compose.platform.LocalSession
2222
import androidx.xr.runtime.Session
23-
import androidx.xr.runtime.SessionCreatePermissionsNotGranted
2423
import androidx.xr.runtime.SessionCreateSuccess
2524

2625
// [START androidxr_localsession]
@@ -30,15 +29,13 @@ fun ComposableUsingSession() {
3029
}
3130
// [END androidxr_localsession]
3231

33-
fun Activity.createSession() {
32+
fun ComponentActivity.createSession() {
3433
// [START androidxr_session_create]
3534
when (val result = Session.create(this)) {
3635
is SessionCreateSuccess -> {
3736
val xrSession = result.session
3837
// ...
3938
}
40-
is SessionCreatePermissionsNotGranted ->
41-
TODO(/* The required permissions in result.permissions have not been granted. */)
4239
else ->
4340
TODO(/* A different unhandled exception was thrown. */)
4441
}

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

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,27 @@ package com.example.xr.scenecore
1818

1919
import androidx.xr.runtime.Session
2020
import androidx.xr.runtime.math.FloatSize3d
21-
import androidx.xr.scenecore.Entity
2221
import androidx.xr.scenecore.ResizableComponent
23-
import androidx.xr.scenecore.ResizeListener
22+
import androidx.xr.scenecore.ResizeEvent
2423
import androidx.xr.scenecore.SurfaceEntity
2524
import java.util.concurrent.Executor
2625

2726
@Suppress("RestrictedApi") // b/416066566
28-
private fun resizableComponentExample(session: Session, entity: Entity, executor: Executor) {
27+
private fun resizableComponentExample(
28+
session: Session,
29+
surfaceEntity: SurfaceEntity,
30+
executor: Executor
31+
) {
2932
// [START androidxr_scenecore_resizableComponentExample]
30-
val resizableComponent = ResizableComponent.create(session)
31-
resizableComponent.minimumSize = FloatSize3d(177f, 100f, 1f)
33+
val resizableComponent = ResizableComponent.create(session) { event ->
34+
if (event.resizeState == ResizeEvent.ResizeState.RESIZE_STATE_END) {
35+
// update the Entity to reflect the new size
36+
surfaceEntity.canvasShape = SurfaceEntity.CanvasShape.Quad(event.newSize.width, event.newSize.height)
37+
}
38+
}
39+
resizableComponent.minimumEntitySize = FloatSize3d(177f, 100f, 1f)
3240
resizableComponent.fixedAspectRatio = 16f / 9f // Specify a 16:9 aspect ratio
3341

34-
resizableComponent.addResizeListener(
35-
executor,
36-
object : ResizeListener {
37-
override fun onResizeEnd(entity: Entity, finalSize: FloatSize3d) {
38-
// update the size in the component
39-
resizableComponent.size = finalSize
40-
41-
// update the Entity to reflect the new size
42-
(entity as SurfaceEntity).canvasShape = SurfaceEntity.CanvasShape.Quad(finalSize.width, finalSize.height)
43-
}
44-
},
45-
)
46-
47-
entity.addComponent(resizableComponent)
42+
surfaceEntity.addComponent(resizableComponent)
4843
// [END androidxr_scenecore_resizableComponentExample]
4944
}

0 commit comments

Comments
 (0)