Gemini live launching and font updates #171
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,123 +22,13 @@ import androidx.annotation.StringRes | |
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.graphics.Color | ||
| import com.android.ai.catalog.R | ||
| import com.android.ai.samples.geminilivetodo.ui.TodoScreen | ||
| 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_live_todo_list_title, | ||
| description = R.string.gemini_live_todo_list_description, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,13 @@ plugins { | |
|
|
||
| subprojects { | ||
| apply(plugin = "com.diffplug.spotless") | ||
|
|
||
| tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach { | ||
| kotlinOptions { | ||
| jvmTarget = "17" | ||
| } | ||
| } | ||
|
|
||
| configure<com.diffplug.gradle.spotless.SpotlessExtension> { | ||
| kotlin { | ||
| target("**/*.kt") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,5 +32,4 @@ android.uniquePackageNames=false | |
| android.dependency.useConstraints=true | ||
| android.r8.strictFullModeForKeepRules=false | ||
| android.r8.optimizedResourceShrinking=false | ||
| android.aarMetadataCheck.enabled=false | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| [versions] | ||
| agp = "8.9.1" | ||
| coilCompose = "3.1.0" | ||
| firebaseAiOndevice = "16.0.0-beta01" | ||
| firebaseBom = "34.11.0" | ||
| lifecycleRuntimeCompose = "2.9.1" | ||
| mlkitGenAi = "1.0.0-beta1" | ||
| kotlin = "2.1.0" | ||
| coreKtx = "1.15.0" | ||
| junit = "4.13.2" | ||
| junitVersion = "1.2.1" | ||
|
|
@@ -14,7 +14,7 @@ kotlinxCoroutinesGuava = "1.10.2" | |
| kotlinxSerializationJson = "1.6.2" | ||
| lifecycleRuntimeKtx = "2.8.7" | ||
| activityCompose = "1.10.1" | ||
| composeBom = "2026.03.01" | ||
|
Contributor
There was a problem hiding this comment. The |
||
| navigationCompose = "2.9.0" | ||
| navigationRuntimeKtx = "2.9.0" | ||
| appcompat = "1.7.0" | ||
|
|
@@ -36,7 +36,7 @@ uiTextGoogleFonts = "1.8.1" | |
| exifinterface = "1.4.1" | ||
| material3WindowSizeClass = "1.3.2" | ||
| richtext = "1.0.0-alpha02" | ||
| glimmer = "1.0.0-alpha11" | ||
| projected = "1.0.0-alpha07" | ||
|
|
||
| [libraries] | ||
|
|
@@ -51,6 +51,7 @@ genai-image-description = { module = "com.google.mlkit:genai-image-description", | |
| genai-proofreading = { module = "com.google.mlkit:genai-proofreading", version.ref = "mlkitGenAi" } | ||
| genai-rewrite = { module = "com.google.mlkit:genai-rewriting", version.ref = "mlkitGenAi" } | ||
| genai-summarization = { module = "com.google.mlkit:genai-summarization", version.ref = "mlkitGenAi" } | ||
| mlkit-segmentation = { module = "com.google.android.gms:play-services-mlkit-subject-segmentation", version.ref = "mlkitSegmentation" } | ||
| junit = { group = "junit", name = "junit", version.ref = "junit" } | ||
| androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } | ||
| androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } | ||
|
|
@@ -88,6 +89,7 @@ ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = | |
| androidx-lifecycle-viewmodel-android = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-android", version.ref = "lifecycleViewmodelAndroid" } | ||
| androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" } | ||
| androidx-xr-glimmer = { group = "androidx.xr.glimmer", name = "glimmer", version.ref = "glimmer" } | ||
| androidx-xr-glimmer-google-fonts = { group = "androidx.xr.glimmer", name = "glimmer-google-fonts", version.ref = "glimmer" } | ||
| androidx-xr-projected = { group = "androidx.xr.projected", name = "projected", version.ref = "projected" } | ||
|
|
||
| [plugins] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ plugins { | |
|
|
||
| android { | ||
| namespace = "com.android.ai.samples.geminilivetodo" | ||
| compileSdk = 37 | ||
|
|
||
| defaultConfig { | ||
| minSdk = 24 | ||
|
|
@@ -52,6 +52,7 @@ android { | |
|
|
||
| dependencies { | ||
| implementation(libs.androidx.xr.glimmer) | ||
| implementation(libs.androidx.xr.glimmer.google.fonts) | ||
| implementation(libs.androidx.xr.projected) | ||
| implementation("com.google.firebase:firebase-ai:17.5.0") | ||
| implementation(libs.androidx.core.ktx) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,9 +20,12 @@ import androidx.compose.ui.tooling.preview.Preview | |
| import androidx.core.content.ContextCompat | ||
| import androidx.lifecycle.lifecycleScope | ||
| import androidx.xr.glimmer.GlimmerTheme | ||
| import androidx.xr.glimmer.googlefonts.createGoogleSansFlexTypography | ||
| import com.android.ai.samples.geminilivetodo.ui.AudioExperience | ||
| import com.android.ai.samples.geminilivetodo.ui.GlimmerTodoScreen | ||
| import com.android.ai.samples.geminilivetodo.ui.TodoScreenViewModel | ||
| import androidx.compose.ui.ComposeUiFlags | ||
| import androidx.compose.ui.ExperimentalComposeUiApi | ||
| import androidx.xr.projected.ProjectedDeviceController | ||
| import androidx.xr.projected.ProjectedDeviceController.Capability | ||
| import androidx.xr.projected.ProjectedDisplayController | ||
|
|
@@ -57,9 +60,10 @@ class GlassesActivity : ComponentActivity() { | |
| setupContent() | ||
| } | ||
|
|
||
| @OptIn(ExperimentalComposeUiApi::class, ExperimentalProjectedApi::class) | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| ComposeUiFlags.isInitialFocusOnFocusableAvailable = true | ||
|
|
||
| viewModel.initializeGeminiLive(this) | ||
|
|
||
|
|
@@ -97,16 +101,20 @@ class GlassesActivity : ComponentActivity() { | |
| } | ||
| } | ||
|
|
||
| @OptIn(ExperimentalProjectedApi::class) | ||
| private fun setupContent() { | ||
| setContent { | ||
| GlimmerTheme( | ||
| typography = createGoogleSansFlexTypography(), | ||
| content = { | ||
| RootScreen( | ||
| isGranted = isPermissionsGranted, | ||
| isDisplayCapable = isDisplayCapable, | ||
| areVisualsOn = areVisualsOn, | ||
| viewModel = viewModel | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -121,6 +129,13 @@ class GlassesActivity : ComponentActivity() { | |
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun onStop() { | ||
| super.onStop() | ||
| // Release high-drain resources (camera, mic, sensors) | ||
| // to prevent battery drain | ||
| viewModel.stopLiveSession() | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -150,12 +165,15 @@ fun RootScreen( | |
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewRootScreen() { | ||
| GlimmerTheme( | ||
| typography = createGoogleSansFlexTypography(), | ||
| content = { | ||
| RootScreen( | ||
| isGranted = false, | ||
| isDisplayCapable = true, | ||
| areVisualsOn = true, | ||
| viewModel = TodoScreenViewModel(com.android.ai.samples.geminilivetodo.data.TodoRepository()) | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is an inconsistency between the
compileSdkof the app (35) and the:samples:gemini-live-todomodule (37). The app'scompileSdkshould be at least as high as the modules it depends on to ensure compatibility and avoid build-time metadata check failures. This mismatch is likely why theAarMetadatacheck was disabled in this PR.