Merge branch 'main' into feature/sticker

# Conflicts:
#	data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
#	feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt

Author: riggaroo

README.md

@@ -43,6 +43,11 @@ fontName="Roboto Flex"
 
 For Googlers, get this info from go/androidify-api-setup
 
+## Availability
+Due to the background vibe feature using 
+`gemini-2.0-flash-preview-image-generation`, its not currently supported in a number of countries in Europe, Middle East & Africa.
+See [this](https://ai.google.dev/gemini-api/docs/models#gemini-2.0-flash-preview-image-generation) doc for more information. 
+
 ## Contributing
 
 See [Contributing](CONTRIBUTING.md).

core/network/src/main/java/com/android/developers/androidify/RemoteConfigDataSource.kt

@@ -40,6 +40,8 @@ interface RemoteConfigDataSource {
     fun getFineTunedModelName(): String
 
     fun getImageGenerationEditsModelName(): String
+
+    fun getBotBackgroundInstructionPrompt(): String
 }
 
 @Singleton
@@ -100,4 +102,8 @@ class RemoteConfigDataSourceImpl @Inject constructor() : RemoteConfigDataSource
     override fun getImageGenerationEditsModelName(): String {
         return remoteConfig.getString("image_generation_model_edits")
     }
+
+    override fun getBotBackgroundInstructionPrompt(): String {
+        return remoteConfig.getString("bot_background_instruction_prompt")
+    }
 }

core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt

@@ -85,12 +85,12 @@ class FirebaseAiDataSourceImpl @Inject constructor(
         return Firebase.ai(backend = GenerativeBackend.vertexAI()).imagenModel(
             remoteConfigDataSource.imageModelName(),
             safetySettings =
-            ImagenSafetySettings(
-                safetyFilterLevel = ImagenSafetyFilterLevel.BLOCK_LOW_AND_ABOVE,
-                // Uses `ALLOW_ADULT` filter since `ALLOW_ALL` requires a special approval
-                // See https://cloud.google.com/vertex-ai/generative-ai/docs/image/responsible-ai-imagen#person-face-gen
-                personFilterLevel = ImagenPersonFilterLevel.ALLOW_ADULT,
-            ),
+                ImagenSafetySettings(
+                    safetyFilterLevel = ImagenSafetyFilterLevel.BLOCK_LOW_AND_ABOVE,
+                    // Uses `ALLOW_ADULT` filter since `ALLOW_ALL` requires a special approval
+                    // See https://cloud.google.com/vertex-ai/generative-ai/docs/image/responsible-ai-imagen#person-face-gen
+                    personFilterLevel = ImagenPersonFilterLevel.ALLOW_ADULT,
+                ),
         )
     }
 

core/network/src/main/res/xml/remote_config_defaults.xml

@@ -16,12 +16,25 @@
 -->
 <defaults>
     <entry>
-        <key>image_generation_model_edits</key>
-        <value>gemini-2.0-flash-preview-image-generation</value>
+        <key>bot_background_instruction_prompt</key>
+        <value>Add the input image android bot as the main subject to the result,
+            it should be the most prominent element of the resultant image, large and
+            filling the foreground - more than 50% of the resultant frame,
+            standing in the center of the frame with the central
+            focus, and the background just underneath the content.
+
+            Always include the input Android Bot in the final result image as the subject of the image.
+            It should be prominently featured in the foreground, center of the frame, without any adjustments other
+            than the lighting of the surrounding environment. There should only be one of the bots in the image.
+            style="3d animation style, simplified shapes, mouthless character, realistic physics simulation"
+
+            Do not alter the input Android Bot image, do not change its shape or add any hands, eyes, mouths etc. Do not change the characters color scheme.
+
+            The background is described as follows:</value>
     </entry>
     <entry>
         <key>use_imagen</key>
-        <value>true</value>
+        <value>false</value>
     </entry>
     <entry>
         <key>prompt_image_validation</key>
@@ -127,6 +140,10 @@
         <key>promo_video_link</key>
         <value>https://services.google.com/fh/files/misc/androidfy_storyboard_b_v07.mp4</value>
     </entry>
+    <entry>
+        <key>image_generation_model_edits</key>
+        <value>gemini-2.0-flash-preview-image-generation</value>
+    </entry>
     <entry>
         <key>text_model_name</key>
         <value>gemini-2.5-flash</value>

core/testing/src/main/java/com/android/developers/testing/network/TestRemoteConfigDataSource.kt

@@ -71,4 +71,8 @@ class TestRemoteConfigDataSource(private val useGeminiNano: Boolean) : RemoteCon
     override fun getImageGenerationEditsModelName(): String {
         return "test_image_model"
     }
+
+    override fun getBotBackgroundInstructionPrompt(): String {
+        return "bot_background_instruction_prompt"
+    }
 }

core/testing/src/main/java/com/android/developers/testing/repository/FakeImageGenerationRepository.kt

@@ -58,9 +58,9 @@ class FakeImageGenerationRepository : ImageGenerationRepository {
         return imageUri
     }
 
-    override suspend fun generateImageWithEdit(
+    override suspend fun addBackgroundToBot(
         image: Bitmap,
-        editPrompt: String,
+        backgroundPrompt: String,
     ): Bitmap {
         return createBitmap(1, 1)
     }

core/testing/src/main/java/com/android/developers/testing/util/FakeComposableBitmapRenderer.kt

@@ -22,11 +22,6 @@ import androidx.core.graphics.createBitmap
 import com.android.developers.androidify.customize.ComposableBitmapRenderer
 
 class FakeComposableBitmapRenderer : ComposableBitmapRenderer {
-    override fun initialize() {
-    }
-
-    override fun dispose() {
-    }
 
     override suspend fun renderComposableToBitmap(
         canvasSize: Size,

data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt

@@ -19,6 +19,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
+import com.android.developers.androidify.RemoteConfigDataSource
 import com.android.developers.androidify.model.ValidatedDescription
 import com.android.developers.androidify.model.ValidatedImage
 import com.android.developers.androidify.ondevice.LocalSegmentationDataSource
@@ -36,8 +37,8 @@ interface ImageGenerationRepository {
     suspend fun saveImage(imageBitmap: Bitmap): Uri
     suspend fun saveImageToExternalStorage(imageBitmap: Bitmap): Uri
     suspend fun saveImageToExternalStorage(imageUri: Uri): Uri
-    suspend fun generateImageWithEdit(image: Bitmap, editPrompt: String): Bitmap
 
+    suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String) : Bitmap
     suspend fun removeBackground(image: Bitmap): Bitmap
 }
 
@@ -47,6 +48,7 @@ internal class ImageGenerationRepositoryImpl @Inject constructor(
     private val internetConnectivityManager: InternetConnectivityManager,
     private val geminiNanoDataSource: GeminiNanoGenerationDataSource,
     private val firebaseAiDataSource: FirebaseAiDataSource,
+    private val remoteConfigDataSource: RemoteConfigDataSource,
     private val localSegmentationDataSource: LocalSegmentationDataSource,
 ) : ImageGenerationRepository {
 
@@ -130,8 +132,10 @@ internal class ImageGenerationRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun generateImageWithEdit(image: Bitmap, editPrompt: String): Bitmap {
-        return firebaseAiDataSource.generateImageWithEdit(image, editPrompt)
+    override suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String): Bitmap {
+        val backgroundBotInstructions = remoteConfigDataSource.getBotBackgroundInstructionPrompt() +
+               "\"" +  backgroundPrompt + "\""
+        return firebaseAiDataSource.generateImageWithEdit(image, backgroundBotInstructions)
     }
 
     override suspend fun removeBackground(image: Bitmap): Bitmap {

feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt

@@ -24,6 +24,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -41,10 +43,11 @@ fun AspectRatioTool(
     selectedOption: SizeOption,
     onSizeOptionSelected: (SizeOption) -> Unit,
     modifier: Modifier = Modifier,
-    singleLine: Boolean = true,
+    singleLine: Boolean = false,
 ) {
     GenericTool(
-        modifier = modifier.wrapContentSize(),
+        modifier = modifier.wrapContentSize()
+            .verticalScroll(rememberScrollState()),
         tools = sizeOptions,
         singleLine = singleLine,
         selectedOption = selectedOption,

feature/results/src/main/java/com/android/developers/androidify/customize/BackgroundTool.kt

@@ -61,7 +61,7 @@ fun BackgroundTool(
         individualToolContent = { tool ->
             Box(
                 modifier = Modifier
-                    .aspectRatio(1f)
+                    .size(70.dp)
                     .border(
                         2.dp,
                         color = MaterialTheme.colorScheme.primary,