Skip to content

[pull] androidx-main from androidx:androidx-main #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Feb 8, 2026
Merged

[pull] androidx-main from androidx:androidx-main #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
493fbf3
Fix set skybox will cause fatal exception
Feb 8, 2026
c1a5911
Merge "Fix set skybox will cause fatal exception" into androidx-main
Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .../testapp/src/main/kotlin/androidx/xr/scenecore/testapp/environment/EnvironmentActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,29 @@ class EnvironmentActivity : AppCompatActivity() {

private fun skyBoxButtonHandlers() {
// Load skybox from a Path
findViewById<Button>(R.id.environment_load_path).setOnClickListener {
val loadPathButton = findViewById<Button>(R.id.environment_load_path)
loadPathButton.setOnClickListener {
lifecycleScope.launch {
greySkybox =
ExrImage.createFromZip(session!!, Paths.get("skyboxes", "GreySkybox.zip"))
addEvent(EventType.SKYBOX_CHANGED, "Grey Skybox loaded from Path")
findViewById<Button>(R.id.environment_button2_1).isEnabled = true
}
}
loadPathButton.isEnabled = true

// Load skybox from a bytes
findViewById<Button>(R.id.environment_load_bytes).setOnClickListener {
val loadBytesButton = findViewById<Button>(R.id.environment_load_bytes)
loadBytesButton.setOnClickListener {
lifecycleScope.launch {
val bytes = assets.open("skyboxes/BlueSkybox.zip").readBytes()
blueSkybox = ExrImage.createFromZip(session!!, bytes, "BlueSkybox.zip")
addEvent(EventType.SKYBOX_CHANGED, "Blue Skybox loaded from Bytes")
findViewById<Button>(R.id.environment_button2_2).isEnabled = true
findViewById<Button>(R.id.environment_button4_1).isEnabled = true
}
}
loadBytesButton.isEnabled = true

// handle grey skybox
findViewById<Button>(R.id.environment_button2_1).setOnClickListener {
Expand Down
5 changes: 5 additions & 0 deletions xr/scenecore/integration-tests/testapp/src/main/res/layout/activity_environment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/test_button"
android:enabled="false"
android:textSize="18sp"
android:textFontWeight="400"
android:text="Load Skybox Bar (Path)"
Expand All @@ -91,6 +92,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/test_button"
android:enabled="false"
android:textSize="18sp"
android:textFontWeight="400"
android:text="Load Skybox Blue (Bytes)"
Expand Down Expand Up @@ -131,6 +133,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/test_button"
android:enabled="false"
android:textSize="18sp"
android:textFontWeight="400"
android:text="Set Skybox Bar"
Expand All @@ -147,6 +150,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/test_button"
android:enabled="false"
android:textSize="18sp"
android:textFontWeight="400"
android:text="Set Skybox Blue"
Expand Down Expand Up @@ -281,6 +285,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/test_button"
android:enabled="false"
android:textSize="18sp"
android:textFontWeight="400"
android:text="Set Geometry and Skybox (Ground, Blue)"
Expand Down
Loading