Feature/kathleen audio flow

app/build.gradle.kts

@@ -86,13 +86,13 @@ dependencies {
     implementation(project(":samples:genai-summarization"))
     implementation(project(":samples:genai-image-description"))
     implementation(project(":samples:genai-writing-assistance"))
-    implementation(project(":samples:imagen"))
-    implementation(project(":samples:imagen-editing"))
+    implementation(project(":samples:nanobanana"))
     implementation(project(":samples:magic-selfie"))
     implementation(project(":samples:gemini-video-summarization"))
     implementation(project(":samples:gemini-live-todo"))
     implementation(project(":samples:gemini-video-metadata-creation"))
     implementation(project(":samples:gemini-image-chat"))
+    implementation(project(":samples:gemini-hybrid"))
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

app/src/main/java/com/android/ai/catalog/domain/SampleCatalog.kt

@@ -31,13 +31,25 @@ import com.android.ai.samples.geminivideosummary.ui.VideoSummarizationScreen
 import com.android.ai.samples.genai_image_description.GenAIImageDescriptionScreen
 import com.android.ai.samples.genai_summarization.GenAISummarizationScreen
 import com.android.ai.samples.genai_writing_assistance.GenAIWritingAssistanceScreen
-import com.android.ai.samples.imagen.ui.ImagenScreen
-import com.android.ai.samples.imagenediting.ui.ImagenEditingScreen
+import com.android.ai.samples.geminihybrid.GeminiHybridScreen
+import com.android.ai.samples.nanobanana.ui.NanobananaScreen
 import com.android.ai.samples.magicselfie.ui.MagicSelfieScreen
 import com.android.ai.theme.extendedColorScheme
+import com.google.firebase.ai.type.PublicPreviewAPI
 
+@OptIn(PublicPreviewAPI::class)
 @RequiresPermission(Manifest.permission.RECORD_AUDIO)
 val sampleCatalog = listOf(
+    SampleCatalogItem(
+        title = R.string.gemini_hybrid_sample_list_title,
+        description = R.string.gemini_hybrid_sample_list_description,
+        route = "GeminiHybridScreen",
+        sampleEntryScreen = { GeminiHybridScreen() },
+        tags = listOf(SampleTags.GEMINI_NANO, SampleTags.GEMINI_FLASH, SampleTags.ML_KIT, SampleTags.FIREBASE),
+        needsFirebase = true,
+        keyArt = R.drawable.img_keyart_text,
+        isFeatured = true,
+    ),
     SampleCatalogItem(
         title = R.string.gemini_image_chat_list_title,
         description = R.string.gemini_image_chat_list_description,
@@ -48,16 +60,6 @@ val sampleCatalog = listOf(
         needsFirebase = true,
         isFeatured = true,
     ),
-    SampleCatalogItem(
-        title = R.string.imagen_editing_sample_list_title,
-        description = R.string.imagen_editing_sample_list_description,
-        route = "ImagenMaskEditing",
-        sampleEntryScreen = { ImagenEditingScreen() },
-        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE),
-        needsFirebase = true,
-        keyArt = R.drawable.img_keyart_imagen,
-        isFeatured = true,
-    ),
     SampleCatalogItem(
         title = R.string.gemini_multimodal_sample_list_title,
         description = R.string.gemini_multimodal_sample_list_description,
@@ -102,11 +104,11 @@ val sampleCatalog = listOf(
         keyArt = R.drawable.img_keyart_text,
     ),
     SampleCatalogItem(
-        title = R.string.imagen_sample_list_title,
-        description = R.string.imagen_sample_list_description,
-        route = "ImagenImageGenerationScreen",
-        sampleEntryScreen = { ImagenScreen() },
-        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE),
+        title = R.string.nanobanana_sample_list_title,
+        description = R.string.nanobanana_sample_list_description,
+        route = "NanobananaImageGenerationScreen",
+        sampleEntryScreen = { NanobananaScreen() },
+        tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE),
         needsFirebase = true,
         keyArt = R.drawable.img_keyart_imagen,
     ),
@@ -115,7 +117,7 @@ val sampleCatalog = listOf(
         description = R.string.magic_selfie_sample_list_description,
         route = "MagicSelfieScreen",
         sampleEntryScreen = { MagicSelfieScreen() },
-        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE, SampleTags.ML_KIT),
+        tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE),
         needsFirebase = true,
         keyArt = R.drawable.img_keyart_magic_selfie,
     ),

app/src/main/res/values/strings.xml

@@ -13,20 +13,20 @@
     <string name="top_bar_title">Android AI Samples</string>
     <string name="top_bar_title_expanded">Android\nAI Samples</string>
     <string name="open_sample_button">Open sample</string>
-    <string name="imagen_sample_list_title">Image generation with Imagen</string>
-    <string name="imagen_sample_list_description">Generate images with Imagen, Google image generation model</string>
-    <string name="imagen_editing_sample_list_title">Image Editing with Imagen</string>
-    <string name="imagen_editing_sample_list_description">Generate images and edit only specific areas of a generated image with inpainting</string>
-    <string name="magic_selfie_sample_list_title">Magic Selfie with Imagen and ML Kit</string>
-    <string name="magic_selfie_sample_list_description">Change the background of your selfies with Imagen and the ML Kit Segmentation API</string>
+    <string name="nanobanana_sample_list_title">Image generation with Nanobanana</string>
+    <string name="nanobanana_sample_list_description">Generate images with Nanobanana, Google image generation model</string>
+    <string name="magic_selfie_sample_list_title">Magic Selfie with Gemini</string>
+    <string name="magic_selfie_sample_list_description">Change the background of your selfies with the Gemini Flash model</string>
     <string name="gemini_video_summarization_sample_list_title">Video Summarization with Gemini and Firebase</string>
     <string name="gemini_video_summarization_sample_list_description">"Generate a summary of a video (from a cloud URL or Youtube) with Gemini API powered by Firebase"</string>
     <string name="gemini_video_metadata_creation_sample_list_title">Video Metadata Creation with Gemini and Firebase</string>
     <string name="gemini_video_metadata_creation_sample_list_description">"Generate metadata of a video (from a cloud URL or Youtube) with Gemini API powered by Firebase"</string>
-    <string name="gemini_live_todo_list_title">Gemini Live Todo</string>
-    <string name="gemini_live_todo_list_description">"Simple Todo app using the Gemini Live API to interact with the items in the list"</string>
-    <string name="gemini_image_chat_list_title">Chat with Nano Banana</string>
-    <string name="gemini_image_chat_list_description">Conversational Image generation with Gemini 2.5 Flash Image</string>
+    <string name="gemini_live_todo_list_title">Gemini Live API to-do</string>
+    <string name="gemini_live_todo_list_description">"Simple to-do app using the Gemini Live API to interact with the items in the list"</string>
+    <string name="gemini_image_chat_list_title">Chat with Nano Banana Pro</string>
+    <string name="gemini_image_chat_list_description">Conversational Image generation with Gemini 3 Pro Image</string>
+    <string name="gemini_hybrid_sample_list_title">Gemini Hybrid</string>
+    <string name="gemini_hybrid_sample_list_description">Inference with Firebase Hybrid SDK using either Gemini Nano on-device or Gemini Flash in the Cloud.</string>
     <string name="firebase_required">Firebase Required</string>
     <string name="firebase_required_description">This feature requires Firebase to be initialized.</string>
     <string name="close">Close</string>

gradle/libs.versions.toml

@@ -1,7 +1,8 @@
 [versions]
 agp = "8.8.2"
 coilCompose = "3.1.0"
-firebaseBom = "34.5.0"
+firebaseAiOndevice = "16.0.0-beta01"
+firebaseBom = "34.11.0"
 lifecycleRuntimeCompose = "2.9.1"
 mlkitGenAi = "1.0.0-beta1"
 kotlin = "2.1.0"
@@ -40,8 +41,9 @@ richtext = "1.0.0-alpha02"
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
+firebase-ai-ondevice = { module = "com.google.firebase:firebase-ai-ondevice", version.ref = "firebaseAiOndevice" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
-firebase-ai = { group = "com.google.firebase", name = "firebase-ai" }
+firebase-ai = { module = "com.google.firebase:firebase-ai"}
 firebase-common-ktx = { group = "com.google.firebase", name = "firebase-common-ktx", version.ref = "firebaseCommonKtx" }
 genai-image-description = { module = "com.google.mlkit:genai-image-description", version.ref = "mlkitGenAi" }
 genai-proofreading = { module = "com.google.mlkit:genai-proofreading", version.ref = "mlkitGenAi" }
@@ -79,7 +81,6 @@ androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "medi
 androidx-media3-ui-compose = { module = "androidx.media3:media3-ui-compose", version.ref = "media3"}
 androidx-media3-transformer = { module = "androidx.media3:media3-transformer", version.ref = "media3" }
 androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
-mlkit-segmentation = { module = "com.google.android.gms:play-services-mlkit-subject-segmentation", version.ref = "mlkitSegmentation" }
 ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "uiToolingPreview" }
 ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" }
 androidx-lifecycle-viewmodel-android = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-android", version.ref = "lifecycleViewmodelAndroid" }
@@ -94,4 +95,4 @@ google-gms-google-services = { id = "com.google.gms.google-services", version.re
 hilt-plugin = { id = "com.google.dagger.hilt.android", version.ref = "hilt"}
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

samples/gemini-hybrid/.gitignore

@@ -0,0 +1 @@
+/build

samples/gemini-hybrid/README.md

@@ -0,0 +1,28 @@
+# Gemini Hybrid Sample
+
+This sample is part of the [AI Sample Catalog](../../). To build and run this sample, you should clone the entire repository.
+
+## Description
+
+This sample demonstrates how to use the Firebase Hybrid SDK, utilizing both on-device (Gemini Nano via [ML Kit Prompt API](https://developers.google.com/ml-kit/genai/prompt/android)) and cloud-based models via the [Firebase AI Logic SDK](https://firebase.google.com/docs/ai-logic).
+
+The sample lets users generate generic user reviews for a hotel based on a few selected topics. 
+
+<div style="text-align: center;">
+<img width="320" alt="Gemini Hybrid SDK in action" src="gemini_hybrid.png" />
+</div>
+
+## How it works
+
+Here is how the model is instantiated to leverage hybrid inference:
+```kotlin
+val model = Firebase.ai(backend = GenerativeBackend.googleAI())
+                .generativeModel(
+                    "gemini-2.5-flash-lite",
+                    onDeviceConfig = OnDeviceConfig(mode = InferenceMode.PREFER_ON_DEVICE)
+                )
+
+val response = model.generateContent(prompt)
+```
+
+Read more about the [Firebase Hybrid SDK](https://firebase.google.com/docs/ai-logic/hybrid/android/get-started?api=dev) in the Firebase documentation.

samples/imagen-editing/build.gradle.kts → samples/gemini-hybrid/build.gradle.kts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)
@@ -21,15 +22,16 @@ plugins {
 }
 
 android {
-    namespace = "com.android.ai.samples.imagenediting"
+    namespace = "com.android.ai.samples.geminihybrid"
     compileSdk = 36
 
     buildFeatures {
         compose = true
     }
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -43,38 +45,31 @@ android {
             )
         }
     }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-
     kotlinOptions {
         jvmTarget = "17"
     }
-
-    lint {
-        warningsAsErrors = true
-    }
 }
 
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material.icons.extended)
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.ai)
     implementation(libs.hilt.android)
     implementation(libs.hilt.navigation.compose)
     implementation(libs.androidx.runtime.livedata)
-    implementation(libs.ui.tooling.preview)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.ai)
+    implementation(libs.firebase.ai.ondevice)
+
     implementation(project(":ui-component"))
     debugImplementation(libs.ui.tooling)
     ksp(libs.hilt.compiler)
-
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
 }

samples/gemini-hybrid/consumer-rules.pro

@@ -0,0 +1 @@
+

samples/imagen-editing/proguard-rules.pro → samples/gemini-hybrid/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile