Merge branch 'google:main' into main

kul3r4 · Apr 12, 2024 · 0693eac · 0693eac
2 parents 8085b18 + eefac51
commit 0693eac
Show file tree

Hide file tree

Showing 84 changed files with 249 additions and 85 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 GROUP=com.google.android.horologist
 # !! No longer need to update this manually when using a Compose SNAPSHOT
-VERSION_NAME=0.6.8
+VERSION_NAME=0.6.9
 
 POM_DESCRIPTION=Utilities for Wear OS
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -52,7 +52,7 @@ okio = "3.9.0"
 org-robolectric = "4.12.1"
 playServicesAuth = "21.0.0"
 protobuf = "4.26.1"
-roborazzi = "1.11.0"
+roborazzi = "1.12.0"
 room = "2.6.1"
 runtimeTracing = "1.0.0-beta01"
 snapshot-android = "1.0.4"
@@ -177,7 +177,7 @@ io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.63.0"
 io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.4.1"
 io-grpc-grpc-android = "io.grpc:grpc-android:1.63.0"
 io-grpc-grpc-binder = "io.grpc:grpc-binder:1.63.0"
-google-generativeai = "com.google.ai.client.generativeai:generativeai:0.2.2"
+google-generativeai = "com.google.ai.client.generativeai:generativeai:0.3.0"
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }

diff --git a/media/audio-ui/src/main/res/values-af/strings.xml b/media/audio-ui/src/main/res/values-af/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Stel volume harder</string>
   <string name="horologist_volume_screen_volume_down_content_description">Stel volume sagter</string>
-  <string name="horologist_volume_screen_connected_state">Gekoppel, Volume %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Nie gekoppel nie</string>
   <string name="horologist_volume_screen_change_audio_output">Verander oudio-uitvoer</string>
   <string name="horologist_speaker_name">Horlosieluidspreker</string>

diff --git a/media/audio-ui/src/main/res/values-am/strings.xml b/media/audio-ui/src/main/res/values-am/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">ድምፅ ጨምር</string>
   <string name="horologist_volume_screen_volume_down_content_description">ድምፅ ቀንስ</string>
-  <string name="horologist_volume_screen_connected_state">ተገናኝቷል፣ የድምፅ መጠን %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">አልተገናኘም</string>
   <string name="horologist_volume_screen_change_audio_output">የኦዲዮ ውፅዓትን መለወጥ</string>
   <string name="horologist_speaker_name">የእጅ ሰዓት ድምፅ ማውጫ</string>

diff --git a/media/audio-ui/src/main/res/values-ar/strings.xml b/media/audio-ui/src/main/res/values-ar/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">رفع مستوى الصوت</string>
   <string name="horologist_volume_screen_volume_down_content_description">خفض مستوى الصوت</string>
-  <string name="horologist_volume_screen_connected_state">متصل، ومستوى الصوت %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">غير متصل</string>
   <string name="horologist_volume_screen_change_audio_output">تغيير إخراج الصوت</string>
   <string name="horologist_speaker_name">سمّاعة الساعة</string>

diff --git a/media/audio-ui/src/main/res/values-as/strings.xml b/media/audio-ui/src/main/res/values-as/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">ভলিউম বঢ়াওক</string>
   <string name="horologist_volume_screen_volume_down_content_description">ভলিউম কমাওক</string>
-  <string name="horologist_volume_screen_connected_state">সংযুক্ত হৈ আছে, ভলিউম %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">সংযুক্ত হৈ নাই</string>
   <string name="horologist_volume_screen_change_audio_output">অডিঅ’ আউটপুট সলনি কৰক</string>
   <string name="horologist_speaker_name">ঘড়ীৰ স্পীকাৰ</string>

diff --git a/media/audio-ui/src/main/res/values-az/strings.xml b/media/audio-ui/src/main/res/values-az/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Səsi artırın</string>
   <string name="horologist_volume_screen_volume_down_content_description">Səsi azaldın</string>
-  <string name="horologist_volume_screen_connected_state">Qoşulub, Səs %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Bağlantı yoxdur</string>
   <string name="horologist_volume_screen_change_audio_output">Audio Çıxışını Dəyişin</string>
   <string name="horologist_speaker_name">Saatın Dinamiki</string>

diff --git a/media/audio-ui/src/main/res/values-b+es+419/strings.xml b/media/audio-ui/src/main/res/values-b+es+419/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Subir el volumen</string>
   <string name="horologist_volume_screen_volume_down_content_description">Bajar el volumen</string>
-  <string name="horologist_volume_screen_connected_state">Conectado (volumen %1$d)</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">No conectado</string>
   <string name="horologist_volume_screen_change_audio_output">Cambiar salida de audio</string>
   <string name="horologist_speaker_name">Bocina del reloj</string>

diff --git a/media/audio-ui/src/main/res/values-be/strings.xml b/media/audio-ui/src/main/res/values-be/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Павялічыць гучнасць</string>
   <string name="horologist_volume_screen_volume_down_content_description">Паменшыць гучнасць</string>
-  <string name="horologist_volume_screen_connected_state">Падключана, гучнасць %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Няма падключэння</string>
   <string name="horologist_volume_screen_change_audio_output">Змяніць аўдыявыхад</string>
   <string name="horologist_speaker_name">Дынамік гадзінніка</string>

diff --git a/media/audio-ui/src/main/res/values-bg/strings.xml b/media/audio-ui/src/main/res/values-bg/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Увеличаване на силата на звука</string>
   <string name="horologist_volume_screen_volume_down_content_description">Намаляване на силата на звука</string>
-  <string name="horologist_volume_screen_connected_state">Свързано, сила на звука %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Няма връзка</string>
   <string name="horologist_volume_screen_change_audio_output">Промяна на аудиоизхода</string>
   <string name="horologist_speaker_name">Високог. на часовн.</string>

diff --git a/media/audio-ui/src/main/res/values-bn/strings.xml b/media/audio-ui/src/main/res/values-bn/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">ভলিউম বাড়ান</string>
   <string name="horologist_volume_screen_volume_down_content_description">ভলিউম কমান</string>
-  <string name="horologist_volume_screen_connected_state">কানেক্ট করা আছে, ভলিউম %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">কানেক্ট করা নেই</string>
   <string name="horologist_volume_screen_change_audio_output">অডিও আউটপুট পরিবর্তন করুন</string>
   <string name="horologist_speaker_name">ওয়াচ স্পিকার</string>

diff --git a/media/audio-ui/src/main/res/values-bs/strings.xml b/media/audio-ui/src/main/res/values-bs/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Pojačavanje zvuka</string>
   <string name="horologist_volume_screen_volume_down_content_description">Stišavanje zvuka</string>
-  <string name="horologist_volume_screen_connected_state">Povezano, jačina zvuka %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Nije povezano</string>
   <string name="horologist_volume_screen_change_audio_output">Promjena izlaza zvuka</string>
   <string name="horologist_speaker_name">Zvučnik sata</string>

diff --git a/media/audio-ui/src/main/res/values-ca/strings.xml b/media/audio-ui/src/main/res/values-ca/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Apuja el volum</string>
   <string name="horologist_volume_screen_volume_down_content_description">Abaixa el volum</string>
-  <string name="horologist_volume_screen_connected_state">Connectat, volum %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Desconnectat</string>
   <string name="horologist_volume_screen_change_audio_output">Canvia la sortida d\'àudio</string>
   <string name="horologist_speaker_name">Altaveu del rellotge</string>

diff --git a/media/audio-ui/src/main/res/values-cs/strings.xml b/media/audio-ui/src/main/res/values-cs/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Zvýšit hlasitost</string>
   <string name="horologist_volume_screen_volume_down_content_description">Snížit hlasitost</string>
-  <string name="horologist_volume_screen_connected_state">Připojeno, hlasitost %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Nepřipojeno</string>
   <string name="horologist_volume_screen_change_audio_output">Změnit zvukový výstup</string>
   <string name="horologist_speaker_name">Reproduktor hodinek</string>

diff --git a/media/audio-ui/src/main/res/values-da/strings.xml b/media/audio-ui/src/main/res/values-da/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Skru op for lyden</string>
   <string name="horologist_volume_screen_volume_down_content_description">Skru ned for lyden</string>
-  <string name="horologist_volume_screen_connected_state">Forbundet, lydstyrke %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Ikke forbundet</string>
   <string name="horologist_volume_screen_change_audio_output">Skift lydudgang</string>
   <string name="horologist_speaker_name">Urets højttaler</string>

diff --git a/media/audio-ui/src/main/res/values-de/strings.xml b/media/audio-ui/src/main/res/values-de/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Lautstärke erhöhen</string>
   <string name="horologist_volume_screen_volume_down_content_description">Lautstärke verringern</string>
-  <string name="horologist_volume_screen_connected_state">Verbunden, Lautstärke %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Nicht verbunden</string>
   <string name="horologist_volume_screen_change_audio_output">Audioausgabe ändern</string>
   <string name="horologist_speaker_name">Watch-Lautsprecher</string>

diff --git a/media/audio-ui/src/main/res/values-el/strings.xml b/media/audio-ui/src/main/res/values-el/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Αύξηση έντασης ήχου</string>
   <string name="horologist_volume_screen_volume_down_content_description">Μείωση έντασης ήχου</string>
-  <string name="horologist_volume_screen_connected_state">Συνδέθηκε, ένταση ήχου %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Δεν έχει συνδεθεί</string>
   <string name="horologist_volume_screen_change_audio_output">Αλλαγή εξόδου ήχου</string>
   <string name="horologist_speaker_name">Ηχείο ρολογιού</string>

diff --git a/media/audio-ui/src/main/res/values-en-rGB/strings.xml b/media/audio-ui/src/main/res/values-en-rGB/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Increase volume</string>
   <string name="horologist_volume_screen_volume_down_content_description">Decrease volume</string>
-  <string name="horologist_volume_screen_connected_state">Connected, volume %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Not connected</string>
   <string name="horologist_volume_screen_change_audio_output">Change audio output</string>
   <string name="horologist_speaker_name">Watch speaker</string>

diff --git a/media/audio-ui/src/main/res/values-en-rIE/strings.xml b/media/audio-ui/src/main/res/values-en-rIE/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Increase volume</string>
   <string name="horologist_volume_screen_volume_down_content_description">Decrease volume</string>
-  <string name="horologist_volume_screen_connected_state">Connected, volume %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Not connected</string>
   <string name="horologist_volume_screen_change_audio_output">Change audio output</string>
   <string name="horologist_speaker_name">Watch speaker</string>

diff --git a/media/audio-ui/src/main/res/values-es-rUS/strings.xml b/media/audio-ui/src/main/res/values-es-rUS/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Subir el volumen</string>
   <string name="horologist_volume_screen_volume_down_content_description">Bajar el volumen</string>
-  <string name="horologist_volume_screen_connected_state">Conectado (volumen %1$d)</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">No conectado</string>
   <string name="horologist_volume_screen_change_audio_output">Cambiar salida de audio</string>
   <string name="horologist_speaker_name">Bocina del reloj</string>

diff --git a/media/audio-ui/src/main/res/values-es/strings.xml b/media/audio-ui/src/main/res/values-es/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Subir volumen</string>
   <string name="horologist_volume_screen_volume_down_content_description">Bajar volumen</string>
-  <string name="horologist_volume_screen_connected_state">Conectado; volumen: %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">No conectado</string>
   <string name="horologist_volume_screen_change_audio_output">Modificar salida de audio</string>
   <string name="horologist_speaker_name">Altavoz del reloj</string>

diff --git a/media/audio-ui/src/main/res/values-et/strings.xml b/media/audio-ui/src/main/res/values-et/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Helitugevuse suurendamine</string>
   <string name="horologist_volume_screen_volume_down_content_description">Helitugevuse vähendamine</string>
-  <string name="horologist_volume_screen_connected_state">Ühendatud, helitugevus on %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Ei ole ühendatud</string>
   <string name="horologist_volume_screen_change_audio_output">Heliväljundi muutmine</string>
   <string name="horologist_speaker_name">Kella kõlar</string>

diff --git a/media/audio-ui/src/main/res/values-eu/strings.xml b/media/audio-ui/src/main/res/values-eu/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">Igo bolumena</string>
   <string name="horologist_volume_screen_volume_down_content_description">Jaitsi bolumena</string>
-  <string name="horologist_volume_screen_connected_state">Konektatuta. Bolumena: %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">Konektatu gabe</string>
   <string name="horologist_volume_screen_change_audio_output">Aldatu audio-irteera</string>
   <string name="horologist_speaker_name">Erlojuaren bozgor.</string>

diff --git a/media/audio-ui/src/main/res/values-fa/strings.xml b/media/audio-ui/src/main/res/values-fa/strings.xml
@@ -17,7 +17,9 @@
 
   <string name="horologist_volume_screen_volume_up_content_description">زیاد کردن صدا</string>
   <string name="horologist_volume_screen_volume_down_content_description">کم کردن صدا</string>
-  <string name="horologist_volume_screen_connected_state">متصل، میزان صدا %1$d</string>
+  <string name="horologist_volume_screen_volume_percent">Volume set to %1$d%%</string>
+  <string name="horologist_volume_screen_volume_zero">Volume muted</string>
+  <string name="horologist_volume_screen_connected_state">Connected</string>
   <string name="horologist_volume_screen_not_connected_state">متصل نیست</string>
   <string name="horologist_volume_screen_change_audio_output">تغییر خروجی صوتی</string>
   <string name="horologist_speaker_name">بلندگوی ساعت</string>