From 23eeb2b90d77c071bba56a982f5a7bd5f1d41507 Mon Sep 17 00:00:00 2001 From: cartland Date: Thu, 23 Oct 2025 11:54:53 -0700 Subject: [PATCH] Resolve ambiguity for Color with named imports Resolves an import ambiguity by specifying `ComposeColor` and `AndroidColor` type aliases in the Imagen snippets. This change also cleans up unused imports and alphabetizes the remaining ones. --- .../main/java/com/example/snippets/ai/ImagenSnippets.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/misc/src/main/java/com/example/snippets/ai/ImagenSnippets.kt b/misc/src/main/java/com/example/snippets/ai/ImagenSnippets.kt index 263d96c47..864fa339d 100644 --- a/misc/src/main/java/com/example/snippets/ai/ImagenSnippets.kt +++ b/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,