Merge main into redesign #94
Merged
Conversation
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
Co-authored-by: calren <5016806+calren@users.noreply.github.com>
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: calren <5016806+calren@users.noreply.github.com>
Add Gemini Video Metadata Creation Sample A new sample demonstrating how to use the Gemini API with Firebase and Media3 to extract metadata from videos. The sample includes: UI for selecting a video from a predefined list or a custom URL. A video player using ExoPlayer to display the selected video. Buttons to trigger different metadata extraction tasks: Thumbnails, Description, Hashtags, Account Tags, Chapters, and Links. Displays the generated text metadata and extracted thumbnail images. Utilizes media3-transformer to extract HDR thumbnails from the video. Includes utility functions for timestamp conversion and managing the video list. Implements a ViewModel to handle the interaction with the Gemini API and manage UI state.
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: calren <5016806+calren@users.noreply.github.com>
Co-authored-by: lethargicpanda <205574+lethargicpanda@users.noreply.github.com>
Co-authored-by: Thomas Ezan <tezan.enssat@gmail.com> Co-authored-by: lethargicpanda <205574+lethargicpanda@users.noreply.github.com>
Change-Id: I9513992b070fd176e740d8af661e40f63af374fc # Conflicts: # ai-catalog/app/src/main/java/com/android/ai/catalog/domain/SampleCatalog.kt # ai-catalog/gradle/libs.versions.toml # ai-catalog/samples/genai-image-description/build.gradle.kts # ai-catalog/samples/genai-image-description/src/main/java/com/android/ai/samples/genai_image_description/GenAIImageDescriptionScreen.kt # ai-catalog/samples/genai-image-description/src/main/java/com/android/ai/samples/genai_image_description/GenAIImageDescriptionViewModel.kt # ai-catalog/samples/genai-summarization/src/main/java/com/android/ai/samples/genai_summarization/GenAISummarizationScreen.kt # ai-catalog/settings.gradle.kts
…80) Co-authored-by: JolandaVerhoef <6952116+JolandaVerhoef@users.noreply.github.com>
Change-Id: I41cd58b399e539b96fb1d3c17a998518ef4c7e15
Change-Id: Ic78072d8ba35a7f03b79912be6284d89ccf588f8
JolandaVerhoef
requested review from
lethargicpanda,
calren and
ksemenova
as code owners
Change-Id: I65751d1a875781c0836a57ef9119478c2b78a588
Change-Id: I14ca67672eec8b1b452683cde3f2adbe68e554a2 # Conflicts: # ai-catalog/app/src/main/java/com/android/ai/catalog/domain/SampleCatalog.kt # ai-catalog/samples/genai-writing-assistance/build.gradle.kts # ai-catalog/samples/genai-writing-assistance/src/main/java/com/android/ai/samples/genai_writing_assistance/GenAIWritingAssistanceScreen.kt # ai-catalog/samples/genai-writing-assistance/src/main/java/com/android/ai/samples/genai_writing_assistance/GenAIWritingAssistanceViewModel.kt # ai-catalog/ui-component/src/main/java/com/android/ai/uicomponent/Buttons.kt
lethargicpanda
added a commit
that referenced
this pull request
Oct 2, 2025
Co-authored-by: Caren <calren24@gmail.com> Co-authored-by: calren <5016806+calren@users.noreply.github.com> Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Thomas Ezan <tezan.enssat@gmail.com> Co-authored-by: Mayuri Khinvasara <mayuri.k18@gmail.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Kateryna Semenova <k.semyonova@gmail.com> Co-authored-by: lethargicpanda <205574+lethargicpanda@users.noreply.github.com> Co-authored-by: JolandaVerhoef <6952116+JolandaVerhoef@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Making sure we keep main and redesign in sync by merging main into redesign and solving merge conflicts