Merge remote-tracking branch 'origin/main' into patch-3

Author: SimonMarquis

.github/workflows/build_and_test.yml

@@ -40,7 +40,13 @@ jobs:
         env:
           DEBUG_GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.DEBUG_GOOGLE_SERVICES_JSON_BASE64 }}
         run: |
-          echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          if [ -z "$DEBUG_GOOGLE_SERVICES_JSON_BASE64" ]; then
+            echo "DEBUG_GOOGLE_SERVICES_JSON_BASE64 is empty. Copying test-google-services.json."
+            cp test-google-services.json app/google-services.json
+          else
+            echo "Decoding DEBUG_GOOGLE_SERVICES_JSON_BASE64."
+            echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          fi
 
       - name: Apply Spotless
         run: ./gradlew spotlessApply
@@ -127,7 +133,13 @@ jobs:
         env:
           DEBUG_GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.DEBUG_GOOGLE_SERVICES_JSON_BASE64 }}
         run: |
-          echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          if [ -z "$DEBUG_GOOGLE_SERVICES_JSON_BASE64" ]; then
+            echo "DEBUG_GOOGLE_SERVICES_JSON_BASE64 is empty. Copying test-google-services.json."
+            cp test-google-services.json app/google-services.json
+          else
+            echo "Decoding DEBUG_GOOGLE_SERVICES_JSON_BASE64."
+            echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          fi
 
       - name: Build
         run: ./gradlew assembleDebug assembleDebugAndroidTest

CODEOWNERS

@@ -0,0 +1 @@
+* @riggaroo @tiwiz

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).

app/build.gradle.kts

@@ -26,6 +26,7 @@ plugins {
     alias(libs.plugins.crashlytics)
     alias(libs.plugins.baselineprofile)
     id("com.google.android.gms.oss-licenses-plugin")
+    id("org.spdx.sbom") version "0.9.0"
 }
 
 android {
@@ -36,8 +37,8 @@ android {
         applicationId = "com.android.developers.androidify"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 3
+        versionName = "1.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -47,7 +48,9 @@ android {
     }
 
     buildTypes {
-        debug {}
+        debug {
+            versionNameSuffix = "-debug"
+        }
         create("benchmark") {
             initWith(buildTypes.getByName("release"))
             matchingFallbacks += listOf("release")
@@ -61,13 +64,24 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
-            baselineProfile.automaticGenerationDuringBuild = true
+            baselineProfile.automaticGenerationDuringBuild = false
             configure<CrashlyticsExtension> {
                 mappingFileUploadEnabled = true
             }
-            // To publish on the Play store a private signing key is required, but to allow anyone
-            // who clones the code to sign and run the release variant, use the debug signing key.
-            signingConfig = signingConfigs.named("debug").get()
+            // Conditionally apply signingConfig for release builds
+            // If the 'CI_BUILD' project property is set to 'true', do not assign a signingConfig.
+            // Otherwise, (e.g., for local Android Studio builds), sign with the debug key.
+            if (project.findProperty("CI_BUILD")?.toString()?.toBoolean() == true) {
+                // For CI builds, we want an unsigned artifact.
+                // No signingConfig is assigned here.
+                // The bundleRelease task will produce an unsigned AAB.
+                println("CI_BUILD property detected. Release build will be unsigned by Gradle.")
+            } else {
+                // For local builds (not CI), sign with the debug key to allow easy deployment.
+                // This ensures you can select the "release" variant in Android Studio and run it.
+                println("Not a CI_BUILD or CI_BUILD property not set. Signing release build with debug key.")
+                signingConfig = signingConfigs.getByName("debug")
+            }
         }
     }
     compileOptions {
@@ -88,6 +102,16 @@ baselineProfile() {
     dexLayoutOptimization = true
 }
 
+spdxSbom {
+    targets {
+        // create a target named "release",
+        // this is used for the task name (spdxSbomForRelease)
+        // and output file (release.spdx.json)
+        create("release") {
+            configurations.set(listOf("releaseRuntimeClasspath"))
+        }
+    }
+}
 dependencies {
     debugImplementation(libs.leakcanary.android)
     implementation(libs.androidx.app.startup)
@@ -144,3 +168,4 @@ androidComponents {
         variantBuilder.enableAndroidTest = false
     }
 }
+

app/proguard-rules.pro

@@ -32,4 +32,4 @@
 
 -keepattributes Signature
 -keepattributes *Annotation*
--keepattributes InnerClasses
+-keepattributes InnerClasses

app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
      Copyright 2025 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,6 +65,7 @@
                 android:name="com.android.developers.androidify.startup.FirebaseRemoteConfigInitializer"
                 android:value="@string/androidx_startup" />
         </provider>
+
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|screenSize|screenLayout"
@@ -87,6 +87,10 @@
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
             android:theme="@style/AppCompatAndroidify" />
+
+        <meta-data
+            android:name="com.google.mlkit.vision.DEPENDENCIES"
+            android:value="subject_segmentation" />
     </application>
 
 </manifest>

app/src/main/java/com/android/developers/androidify/MainActivity.kt

@@ -17,7 +17,6 @@ package com.android.developers.androidify
 
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
 import android.view.WindowManager
 import android.window.TrustedPresentationThresholds
 import androidx.activity.ComponentActivity
@@ -33,12 +32,16 @@ import com.android.developers.androidify.navigation.MainNavigation
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.util.LocalOcclusion
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.function.Consumer
 
 @ExperimentalMaterial3ExpressiveApi
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
     private val isWindowOccluded = mutableStateOf(false)
+    private val presentationListener = Consumer<Boolean> { isMinFractionRendered ->
+        isWindowOccluded.value = !isMinFractionRendered
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,16 +72,26 @@ class MainActivity : ComponentActivity() {
             val minFractionRendered = 0.25f
             val stabilityRequirements = 500
             val presentationThreshold = TrustedPresentationThresholds(
-                minAlpha, minFractionRendered, stabilityRequirements
+                minAlpha,
+                minFractionRendered,
+                stabilityRequirements,
             )
 
             val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
             windowManager.registerTrustedPresentationListener(
                 window.decorView.windowToken,
                 presentationThreshold,
-                mainExecutor
-            ) { isMinFractionRendered -> isWindowOccluded.value = !isMinFractionRendered }
+                mainExecutor,
+                presentationListener,
+            )
         }
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+            windowManager.unregisterTrustedPresentationListener(presentationListener)
+        }
+    }
 }

app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt

@@ -26,7 +26,6 @@ import androidx.compose.animation.scaleOut
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -121,7 +120,7 @@ fun MainNavigation() {
                     },
                     onLicensesClicked = {
                         context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
-                    }
+                    },
                 )
             }
         },

benchmark/src/main/kotlin/com/android/developers/androidify/baselineprofile/BaselineProfileGenerator.kt

@@ -45,9 +45,9 @@ class BaselineProfileGenerator {
         ) {
             uiAutomator {
                 startApp(packageName = packageName)
-                onView { textAsString() == "Let's Go" }.click()
-                onView { textAsString() == "Prompt" }.click()
-                onView { isEditable }.apply {
+                onElement { textAsString() == "Let's Go" }.click()
+                onElement { textAsString() == "Prompt" }.click()
+                onElement { isEditable }.apply {
                     click()
                     text =
                         "wearing brown sneakers, a red t-shirt, " +

benchmark/src/main/kotlin/com/android/developers/androidify/benchmark/PromptBenchmark.kt

@@ -68,9 +68,9 @@ class PromptBenchmark {
         ) {
             uiAutomator {
                 startApp(packageName = packageName)
-                onView { textAsString() == "Let's Go" }.click()
-                onView { textAsString() == "Prompt" }.click()
-                onView { isEditable }.apply {
+                onElement { textAsString() == "Let's Go" }.click()
+                onElement { textAsString() == "Prompt" }.click()
+                onElement { isEditable }.apply {
                     click()
                     text =
                         "wearing brown sneakers, a red t-shirt, " +