Nav3 migration

AdaptiveJetStream/benchmark/build.gradle.kts

@@ -33,11 +33,11 @@ kotlin {
 
 configure<TestExtension> {
     namespace = "com.google.jetstream.benchmark"
-    compileSdk = 35
+    compileSdk = 37
 
     defaultConfig {
         minSdk = 28
-        targetSdk = 35
+        targetSdk = 37
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR"

AdaptiveJetStream/gradle/libs.versions.toml

@@ -1,33 +1,35 @@
 [versions]
 activity-compose = "1.13.0"
-android-gradle-plugin = "9.1.1"
-android-test-plugin = "9.1.1"
-androidx-baselineprofile = "1.5.0-alpha05"
+android-gradle-plugin = "9.2.1"
+android-test-plugin = "9.2.1"
+androidx-baselineprofile = "1.5.0-alpha06"
 benchmark-macro-junit4 = "1.4.1"
 coil-compose = "2.7.0"
-compose-bom = "2026.03.01"
-compose-latest = "1.11.0-rc01"
+compose-bom = "2026.05.00"
+compose-latest = "1.12.0-alpha02"
 concurrent-futures-ktx = "1.3.0"
 core-ktx = "1.18.0"
 core-splashscreen = "1.2.0"
 hilt-navigation-compose = "1.3.0"
 hilt-android = "2.59.2"
 junit = "1.3.0"
 junit4 = "4.13.2"
-kotlin-android = "2.3.20"
+kotlin-android = "2.3.21"
 kotlinx-coroutines = "1.10.2"
-kotlinx-serialization = "1.10.0"
+kotlinx-serialization = "1.11.0"
 ksp = "2.3.2"
 lifecycle-runtime-ktx = "2.10.0"
 material3-adaptive = "1.2.0"
 material3-adaptive-navigation = "1.4.0"
+material3-adaptive-navigation3 = "1.3.0-beta01"
 media3 = "1.10.0"
-navigation-compose = "2.9.7"
+navigation3 = "1.1.1"
 profileinstaller = "1.4.1"
 uiautomator = "2.3.0"
 rules = "1.7.0"
 window = "1.5.1"
-xr = "1.0.0-alpha12"
+xr = "1.0.0-alpha14"
+xr-compose = "1.0.0-alpha13"
 xr-material3 = "1.0.0-alpha16"
 screenshot = "0.0.1-alpha14"
 robolectric = "4.16.1"
@@ -55,6 +57,7 @@ androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle-runtime-ktx" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-runtime-ktx" }
+androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycle-runtime-ktx" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "material3-adaptive" }
 androidx-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "material3-adaptive" }
@@ -63,7 +66,9 @@ androidx-material3-adaptive-navigation-suite = { module = "androidx.compose.mate
 androidx-media3-session = { module = "androidx.media3:media3-session", version.ref = "media3" }
 androidx-media3-ui = { module = "androidx.media3:media3-ui-compose", version.ref = "media3" }
 androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
+androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
+androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
+androidx-material3-adaptive-navigation3 = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation3", version.ref = "material3-adaptive-navigation3" }
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "profileinstaller" }
 androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" }
@@ -76,7 +81,7 @@ androidx-rules = { group = "androidx.test", name = "rules", version.ref = "rules
 androidx-window = { module = "androidx.window:window", version.ref = "window" }
 androidx-window-core = { module = "androidx.window:window-core", version.ref = "window" }
 androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "xr" }
-androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "xr" }
+androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "xr-compose" }
 androidx-xr-compose-material3 = { module = "androidx.xr.compose.material3:material3", version.ref = "xr-material3" }
 screenshot-validation-api = { group = "com.android.tools.screenshot", name = "screenshot-validation-api", version.ref = "screenshot" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }

AdaptiveJetStream/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

AdaptiveJetStream/jetstream/build.gradle.kts

@@ -43,12 +43,12 @@ kotlin {
 configure<ApplicationExtension> {
     namespace = "com.google.jetstream"
     // Needed for latest androidx snapshot build
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.google.jetstream"
         minSdk = 28
-        targetSdk = 36
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 
@@ -64,6 +64,7 @@ configure<ApplicationExtension> {
         }
         getByName("release") {
             isMinifyEnabled = true
+            isShrinkResources = true
             signingConfig = signingConfigs.getByName("debug")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -194,7 +195,10 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.compose)
 
     // Compose Navigation
-    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.material3.adaptive.navigation3)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
 
     // Coil
     implementation(libs.coil.compose)

AdaptiveJetStream/jetstream/src/main/AndroidManifest.xml

@@ -80,9 +80,6 @@ https://www.apache.org/licenses/LICENSE-2.0
                 android:defaultHeight="540dp"
                 android:gravity="center" />
 
-            <property
-                android:name="android.window.PROPERTY_XR_ACTIVITY_START_MODE"
-                android:value="XR_ACTIVITY_START_MODE_FULL_SPACE_MANAGED" />
         </activity>
 
         <service

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/MainActivity.kt

@@ -17,6 +17,7 @@
 package com.google.jetstream
 
 import android.content.pm.PackageManager
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
@@ -25,6 +26,7 @@ import android.view.KeyboardShortcutInfo
 import android.view.Menu
 import android.view.WindowInsetsController
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.safeDrawingPadding
@@ -46,14 +48,21 @@ class MainActivity : ComponentActivity() {
         installSplashScreen()
         super.onCreate(savedInstanceState)
 
-        enableEdgeToEdge()
+        enableEdgeToEdge(
+            statusBarStyle =
+                SystemBarStyle.dark(
+                    Color.TRANSPARENT,
+                ),
+            navigationBarStyle =
+                SystemBarStyle.dark(
+                    Color.TRANSPARENT,
+                ),
+        )
         tryEnableCustomHeader()
         setContent {
             ProvideLocalEngagementMode {
                 JetStreamTheme {
                     App(
-                        // TODO: Figure out why this is being used instead of a BackHandler
-                        onActivityBackPressed = onBackPressedDispatcher::onBackPressed,
                         // TODO: Is it necessary to tell every child that they need to use safe drawing padding?
                         //  This feels like it would be better declared by the main app layouts rather than being mandated here
                         modifier =