Merge branch 'main' into main

Author: sushantsikka

gradle/libs.versions.toml

@@ -28,9 +28,9 @@ androidx-test-junit = "1.3.0"
 androidx-window = "1.5.0"
 androidx-window-core = "1.5.0"
 androidx-window-java = "1.5.0"
-androidx-xr-arcore = "1.0.0-alpha06"
-androidx-xr-compose = "1.0.0-alpha07"
-androidx-xr-scenecore = "1.0.0-alpha07"
+androidx-xr-arcore = "1.0.0-alpha07"
+androidx-xr-compose = "1.0.0-alpha08"
+androidx-xr-scenecore = "1.0.0-alpha08"
 androidxHiltNavigationCompose = "1.3.0"
 appcompat = "1.7.1"
 coil = "2.7.0"

misc/src/main/java/com/example/snippets/ai/GeminiDeveloperApiSnippets.kt

@@ -16,7 +16,7 @@
 
 package com.example.snippets.ai
 
-import android.content.ContentResolver
+import android.app.Application
 import android.graphics.Bitmap
 import android.net.Uri
 import com.google.firebase.Firebase
@@ -80,12 +80,13 @@ fun textAndImageInput(scope: CoroutineScope, bitmap: Bitmap) {
 @Suppress("unused")
 fun textAndAudioInput(
     scope: CoroutineScope,
-    contentResolver: ContentResolver,
+    applicationContext: Application,
     audioUri: Uri
 ) {
     val model = GeminiDeveloperApi25FlashModelConfiguration.model
     // [START android_gemini_developer_api_multimodal_audio_input]
     scope.launch {
+        val contentResolver = applicationContext.contentResolver
         contentResolver.openInputStream(audioUri).use { stream ->
             stream?.let {
                 val bytes = it.readBytes()
@@ -105,12 +106,13 @@ fun textAndAudioInput(
 @Suppress("unused")
 fun textAndVideoInput(
     scope: CoroutineScope,
-    contentResolver: ContentResolver,
+    applicationContext: Application,
     videoUri: Uri
 ) {
     val model = GeminiDeveloperApi25FlashModelConfiguration.model
     // [START android_gemini_developer_api_multimodal_video_input]
     scope.launch {
+        val contentResolver = applicationContext.contentResolver
         contentResolver.openInputStream(videoUri).use { stream ->
             stream?.let {
                 val bytes = it.readBytes()

misc/src/main/java/com/example/snippets/ai/ImagenSnippets.kt

@@ -57,8 +57,8 @@ import com.google.firebase.ai.type.ImagenAspectRatio
 import com.google.firebase.ai.type.ImagenBackgroundMask
 import com.google.firebase.ai.type.ImagenControlReference
 import com.google.firebase.ai.type.ImagenControlType
-import com.google.firebase.ai.type.ImagenEditingConfig
 import com.google.firebase.ai.type.ImagenEditMode
+import com.google.firebase.ai.type.ImagenEditingConfig
 import com.google.firebase.ai.type.ImagenGenerationConfig
 import com.google.firebase.ai.type.ImagenGenerationResponse
 import com.google.firebase.ai.type.ImagenImageFormat
@@ -170,6 +170,8 @@ suspend fun removeBallFromImage(
 // [END android_imagen_inpaint_removal]
 
 // [START android_imagen_editing_mask_editor]
+//import androidx.compose.ui.graphics.Color as ComposeColor
+
 @Composable
 fun ImagenEditingMaskEditor(
     sourceBitmap: Bitmap,
@@ -260,6 +262,9 @@ fun ImagenEditingMaskEditor(
 // [END android_imagen_editing_mask_editor]
 
 // [START android_imagen_editing_create_mask]
+// import android.graphics.Color as AndroidColor
+// import android.graphics.Paint
+
 private fun createMaskBitmap(
     sourceBitmap: Bitmap,
     paths: SnapshotStateList<Path>,

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

@@ -21,7 +21,6 @@ import androidx.xr.arcore.AnchorCreateSuccess
 import androidx.xr.arcore.Trackable
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
-import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigureSuccess
 import androidx.xr.runtime.math.Pose
 import androidx.xr.scenecore.AnchorEntity
@@ -35,8 +34,6 @@ fun configureAnchoring(session: Session) {
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureSuccess -> TODO(/* Success! */)
-        is SessionConfigureConfigurationNotSupported ->
-            TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         else ->
             TODO(/* The session could not be configured. See SessionConfigureResult for possible causes. */)
     }

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

@@ -23,7 +23,6 @@ import androidx.xr.arcore.Hand
 import androidx.xr.arcore.HandJointType
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
-import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigureSuccess
 import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Quaternion
@@ -41,8 +40,6 @@ fun ComponentActivity.configureSession(session: Session) {
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureSuccess -> TODO(/* Success! */)
-        is SessionConfigureConfigurationNotSupported ->
-            TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         else ->
             TODO(/* The session could not be configured. See SessionConfigureResult for possible causes. */)
     }

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

@@ -19,7 +19,6 @@ package com.example.xr.arcore
 import androidx.xr.arcore.Plane
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
-import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigureSuccess
 import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Ray
@@ -32,8 +31,6 @@ fun configurePlaneTracking(session: Session) {
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureSuccess -> TODO(/* Success! */)
-        is SessionConfigureConfigurationNotSupported ->
-            TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         else ->
             TODO(/* The session could not be configured. See SessionConfigureResult for possible causes. */)
     }