From 14b22039303e3b29052ae5c27385d38027a78f6e Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Fri, 2 Oct 2026 18:05:32 +0200 Subject: [PATCH 1/3] WIP - Add Glimmer focusColor Button's parameter --- gradle.properties | 2 +- xr/libs.versions.toml | 2 +- .../java/com/example/xr/glimmer/ButtonSamples.kt | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9653065a7..9fcfe1d51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ android.enableR8.fullMode=true # Use an AndroidX snapshot build. # https://androidx.dev/snapshots/builds -# snapshotVersion=15680104 +snapshotVersion=16500517 # Enabled parallel sync for Gradle 9.4+ org.gradle.tooling.parallel=true diff --git a/xr/libs.versions.toml b/xr/libs.versions.toml index adb9f898a..198386086 100644 --- a/xr/libs.versions.toml +++ b/xr/libs.versions.toml @@ -2,7 +2,7 @@ androidx-xr-arcore = "1.0.0-beta02" androidx-xr-arcore-play-services = "1.0.0-beta02" androidx-xr-compose = "1.0.0-alpha17" -androidx-xr-glimmer = "1.0.0-alpha20" +androidx-xr-glimmer = "1.0.0-SNAPSHOT" # Keep the Projected dependency on alpha10 until the emulator supports the latest APIs - b/544045508 androidx-xr-projected = "1.0.0-alpha10" androidx-xr-scenecore = "1.0.0-beta02" diff --git a/xr/src/main/java/com/example/xr/glimmer/ButtonSamples.kt b/xr/src/main/java/com/example/xr/glimmer/ButtonSamples.kt index 4b774d6aa..883859d6f 100644 --- a/xr/src/main/java/com/example/xr/glimmer/ButtonSamples.kt +++ b/xr/src/main/java/com/example/xr/glimmer/ButtonSamples.kt @@ -23,6 +23,7 @@ import androidx.compose.material.icons.filled.Favorite import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.xr.glimmer.Button import androidx.xr.glimmer.ButtonGroup import androidx.xr.glimmer.GlimmerTheme @@ -74,4 +75,16 @@ fun ButtonGroupControlCurrentItemSample() { } } // [END androidxr_glimmer_button_group_control] +} + +@Composable +fun FocusButtonSample(brandColor: Color) { + // [START androidxr_glimmer_button_focus_color] + Button( + onClick = {}, + focusedColor = brandColor, + ) { + Text("Focus Color Button") + } + // [END androidxr_glimmer_button_focus_color] } \ No newline at end of file From eb408cdcaafc14d853b02009649b8bc93d419ea0 Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Mon, 5 Oct 2026 17:06:21 +0200 Subject: [PATCH 2/3] Remove unused parameters --- xr/src/main/java/com/example/xr/compose/SpatialPanel.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/xr/src/main/java/com/example/xr/compose/SpatialPanel.kt b/xr/src/main/java/com/example/xr/compose/SpatialPanel.kt index 209088af9..234ffc18a 100644 --- a/xr/src/main/java/com/example/xr/compose/SpatialPanel.kt +++ b/xr/src/main/java/com/example/xr/compose/SpatialPanel.kt @@ -30,12 +30,10 @@ import androidx.compose.ui.unit.sp import androidx.xr.compose.platform.LocalSpatialCapabilities import androidx.xr.compose.spatial.Subspace import androidx.xr.compose.subspace.SpatialPanel -import androidx.xr.compose.subspace.layout.MovePolicy import androidx.xr.compose.subspace.layout.SubspaceModifier import androidx.xr.compose.subspace.layout.height import androidx.xr.compose.subspace.layout.movable import androidx.xr.compose.subspace.layout.resizable -import androidx.xr.compose.subspace.layout.transformingMovable import androidx.xr.compose.subspace.layout.width @Composable From 8f41d1515af49af53e78c1b15ae8809eb48d95cd Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Mon, 5 Oct 2026 17:17:59 +0200 Subject: [PATCH 3/3] Temporarily suppress deprecation warnings ahead of release captain changes --- xr/src/main/java/com/example/xr/compose/Orbiter.kt | 2 ++ xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xr/src/main/java/com/example/xr/compose/Orbiter.kt b/xr/src/main/java/com/example/xr/compose/Orbiter.kt index f652bcfe9..b133fd6f5 100644 --- a/xr/src/main/java/com/example/xr/compose/Orbiter.kt +++ b/xr/src/main/java/com/example/xr/compose/Orbiter.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package com.example.xr.compose import androidx.compose.foundation.background diff --git a/xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt b/xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt index fc53c3983..d747a03db 100644 --- a/xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt +++ b/xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package com.example.xr.scenecore import android.content.ActivityNotFoundException