Merge "Color Picker Fragment Dark Mode Toggle (1/2)" into tm-qpr-dev
diff --git a/res/layout/clock_carousel.xml b/res/layout/clock_carousel.xml
index 098586e..cfc7e4e 100644
--- a/res/layout/clock_carousel.xml
+++ b/res/layout/clock_carousel.xml
@@ -19,59 +19,79 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/motion_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
app:layoutDescription="@xml/carousel_scene">
- <FrameLayout
+ <com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
android:id="@+id/item_view_0"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
- android:layout_marginEnd="16dp"
- android:scaleType="centerCrop"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ android:layout_marginEnd="@dimen/clock_carousel_item_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/item_view_1"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center" />
+ </com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
- <FrameLayout
+ <com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
android:id="@+id/item_view_1"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
- android:layout_marginEnd="16dp"
- android:scaleType="centerCrop"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ android:layout_marginEnd="@dimen/clock_carousel_item_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/item_view_2"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent" >
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center" />
+ </com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
- <FrameLayout
+ <com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
android:id="@+id/item_view_2"
- android:layout_width="@dimen/clock_carousel_item_large_size"
- android:layout_height="@dimen/clock_carousel_item_large_size"
- android:scaleType="centerCrop"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center" />
+ </com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
- <FrameLayout
+ <com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
android:id="@+id/item_view_3"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
- android:layout_marginStart="16dp"
- android:scaleType="centerCrop"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ android:layout_marginStart="@dimen/clock_carousel_item_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/item_view_2"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent" >
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center" />
+ </com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
- <FrameLayout
+ <com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
android:id="@+id/item_view_4"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
- android:layout_marginStart="16dp"
- android:scaleType="centerCrop"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ android:layout_marginStart="@dimen/clock_carousel_item_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/item_view_3"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent" >
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center" />
+ </com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
<androidx.constraintlayout.helper.widget.Carousel
android:id="@+id/carousel"
diff --git a/res/layout/clock_carousel_view.xml b/res/layout/clock_carousel_view.xml
index 21ff266..f1c959c 100644
--- a/res/layout/clock_carousel_view.xml
+++ b/res/layout/clock_carousel_view.xml
@@ -17,4 +17,4 @@
<com.android.customization.picker.clock.ui.view.ClockCarouselView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
\ No newline at end of file
+ android:layout_height="@dimen/screen_preview_height" />
\ No newline at end of file
diff --git a/res/layout/clock_size_radio_button_group.xml b/res/layout/clock_size_radio_button_group.xml
index d520756..4264007 100644
--- a/res/layout/clock_size_radio_button_group.xml
+++ b/res/layout/clock_size_radio_button_group.xml
@@ -54,7 +54,7 @@
</LinearLayout>
<LinearLayout
- android:id="@+id/button_container_large"
+ android:id="@+id/button_container_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -72,6 +72,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:text="@string/clock_size_large" />
+ android:text="@string/clock_size_small" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index daa9e96..ece357d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Versteek kennisgewings op die sluitskerm"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Meer opsies"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Teks op sluitskerm, Wat Speel, en meer"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Nog kleure"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f6b2dfc..0877a40 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"ጽሑፍ በማያ ገጽ ቁልፍ፣ አሁን በመጫወት ላይ እና ሌሎችም"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c36700c..3ec1745 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"النص على شاشة القفل و\"التعرف التلقائي على الموسيقى\" والمزيد"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 6cee321..cfe6d10 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"লক স্ক্ৰীন, বৰ্তমান প্লে’ হৈ থকা সমল আৰু অধিকত থকা পাঠ"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 8152996..da07bd6 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Kilid ekranında mətn, İndi Oxudulur və s."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 86de08b..2fbb312 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Sakrij obaveštenja na zaključanom ekranu"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Još opcija"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst na zaključanom ekranu, Trenutno svira i drugo"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Još boja"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 4cb7d52..b66cddc 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Тэкст на экране блакіроўкі, функцыя \"Зараз іграе\" і іншае"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 87e47b9..72a0d6d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Текст на заключения екран, „Сега слушате“ и др."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 14d5fb5..3533804 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"লক স্ক্রিনে বিজ্ঞপ্তি লুকান"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"আরও বিকল্প"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"লক স্ক্রিনে টেক্সট, এখন চলছে এবং আরও অনেক কিছু"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"আরও রঙ"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6b6e2ee..31aab91 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Sakrivanje obavještenja na zaključanom ekranu"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Više opcija"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst na zaključanom ekranu, Trenutno se reproducira i drugo"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Više boja"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7325e2b..cf1b766 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Text a la pantalla de bloqueig, Està sonant i més"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a4b323b..d275c41 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Text na obrazovce uzamčení, Co to hraje a další funkce"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index afe1e20..f41cebc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst på låseskærmen, Find sangen og meget mere"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e725cb5..5063dfc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Text auf dem Sperrbildschirm, Now Playing und mehr"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 635aa02..fb82503 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Απόκρυψη ειδοποιήσεων στην οθόνη κλειδώματος"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Περισσότερες επιλογές"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Κείμενο στην οθόνη κλειδώματος, λειτουργία \"Ακούγεται τώρα\" κ.ά."</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Περισσότερα χρώματα"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index f15dc1b..dfe5777 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -114,6 +114,7 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Hide notifications on the lock screen"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"More options"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text on lock screen, Now Playing and more"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
- <skip />
+ <string name="more_colors" msgid="3191071655353004591">"More colours"</string>
+ <string name="content_description_default_color_option" msgid="7011899327541080695">"Default colour option"</string>
+ <string name="content_description_color_option" msgid="4169813692012119578">"Colour option <xliff:g id="ID_1">%1$d</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 50bb349..15a4536 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -139,4 +139,8 @@
<skip />
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f15dc1b..dfe5777 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -114,6 +114,7 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Hide notifications on the lock screen"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"More options"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text on lock screen, Now Playing and more"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
- <skip />
+ <string name="more_colors" msgid="3191071655353004591">"More colours"</string>
+ <string name="content_description_default_color_option" msgid="7011899327541080695">"Default colour option"</string>
+ <string name="content_description_color_option" msgid="4169813692012119578">"Colour option <xliff:g id="ID_1">%1$d</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f15dc1b..dfe5777 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -114,6 +114,7 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Hide notifications on the lock screen"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"More options"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text on lock screen, Now Playing and more"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
- <skip />
+ <string name="more_colors" msgid="3191071655353004591">"More colours"</string>
+ <string name="content_description_default_color_option" msgid="7011899327541080695">"Default colour option"</string>
+ <string name="content_description_color_option" msgid="4169813692012119578">"Colour option <xliff:g id="ID_1">%1$d</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 7e895bc..3169885 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -114,6 +114,7 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Hide notifications on the lock screen"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"More options"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text on lock screen, Now Playing, and more"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
- <skip />
+ <string name="more_colors" msgid="3191071655353004591">"More Colors"</string>
+ <string name="content_description_default_color_option" msgid="7011899327541080695">"Default color option"</string>
+ <string name="content_description_color_option" msgid="4169813692012119578">"Color option <xliff:g id="ID_1">%1$d</xliff:g>"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7a0720a..e186c10 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Texto en la pantalla de bloqueo, Está sonando y mucho más"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 23f0353..2ba9c0e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Texto en pantalla de bloqueo, Está Sonando y más"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 724c03f..d863d67 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Peida märguanded lukustuskuval"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Rohkem valikuid"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst lukustuskuval, Hetkel mängimas ja muud"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Rohkem värve"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index b9456b2..03dbdca 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Ezkutatu jakinarazpenak pantaila blokeatuan"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Aukera gehiago"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Testua pantaila blokeatuan, Orain erreproduzitzen eta abar"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Kolore gehiago"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9adc8ce..9b9416c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"نوشتار صفحه قفل، درحال پخش، و موارد دیگر"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index cec009f..5c1bb58 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Lukitusnäytöllä näkyvä teksti, Musiikintunnistus ja muita"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index fa6c692..9ed0f83 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Texte sur l\'écran de verrouillage, En cours de lecture, etc."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e7f9391..1be405f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Texte sur l\'écran de verrouillage, fonction En écoute etc."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 4857d9c..5b9fe1c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Texto na pantalla de bloqueo, Está soando e moito máis"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 45fab47..65afdab 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"લૉક સ્ક્રીન પરની ટેક્સ્ટ, હમણાં વાગી રહ્યું છે અને બીજું ઘણું"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3521b71..f6ba9bd 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"लॉक स्क्रीन पर सूचनाएं छिपाएं"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"ज़्यादा विकल्प"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"लॉक स्क्रीन पर टेक्स्ट जोड़ना, \'अभी चल रहा है\' सुविधा वगैरह"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"ज़्यादा कलर"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2ebaea0..14deedf 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Skrivanje obavijesti na zaključanom zaslonu"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Više opcija"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst na zaključanom zaslonu, Upravo svira i još mnogo toga"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Više boja"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c510d4b..250c00d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Szöveg a lezárási képernyőn, Now Playing és egyebek"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1ca8dd4..5a9d849 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Թաքցնել ծանուցումները կողպէկրանին"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Այլ ընտրանքներ"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Տեքստ կողպէկրանին, Այժմ հնչում է և այլ գործառույթներ"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Այլ գույներ"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f4dcfd9..d15f50b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Teks di layar kunci, Now Playing, dan lainnya"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 332dd7e..9ced822 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Texti á lásskjá, „Í spilun“ og fleira"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 48dc257..9aca950 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Nascondi le notifiche sulla schermata di blocco"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Altre opzioni"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Testo su schermata di blocco, Now Playing e altro ancora"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Altri colori"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0ab556a..2bc3bd9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"הסתרת ההתראות במסך הנעילה"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"אפשרויות נוספות"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"טקסט שמופיע במסך הנעילה, \'מה שומעים עכשיו?\' ועוד"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"צבעים נוספים"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cf0e9a5..d976941 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"ロック画面では通知を非表示にします"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"その他のオプション"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ロック画面のテキスト、「この曲なに？」など"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"他の色"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2b4adf5..d8c18e6 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"შეტყობინებების დამალვა ჩაკეტილ ეკრანზე"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"სხვა ვარიანტები"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ტექსტი ჩაკეტილ ეკრანზე, ახლა უკრავს და სხვა"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"მეტი ფერი"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9938fd4..1a10254 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Құлыптаулы экранда мәтіндік хабар жазу, Now Playing және т.б."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c2bc499..87702b7 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"អក្សរនៅលើអេក្រង់ចាក់សោ, Now Playing និងអ្វីៗជាច្រើនទៀត"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 4b3663f..17ece04 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿನ ಪಠ್ಯ, Now Playing ಮತ್ತು ಇನ್ನಷ್ಟು"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"ಇನ್ನಷ್ಟು ಬಣ್ಣಗಳು"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 50c057c..a1c81c0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"잠금 화면에 표시되는 텍스트, Now Playing, 등"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 351c18e..5a09913 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Кулпу экранындагы текст, \"Эмне ойноп жатат?\" жана башка нерселер"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 5efc833..70cb9db 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"ເຊື່ອງການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ຂໍ້ຄວາມຢູ່ໜ້າຈໍລັອກ, Now Playing ແລະ ອື່ນໆ"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"ສີເພີ່ມເຕີມ"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a602b5d..b0a24e2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekstas užrakinimo ekrane, „Dabar leidžiama“ ir kt."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 29ce307..eb81a24 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Teksts bloķēšanas ekrānā, funkcija “Tagad atskaņo” u.c."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 148d82e..4cf223e 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Текст на заклучен екран, Now Playing и друго"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 41aa4d7..a38bb1a 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"ലോക്ക് സ്ക്രീനിൽ അറിയിപ്പുകൾ മറയ്ക്കുക"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ലോക്ക് സ്ക്രീനിൽ ടെക്സ്റ്റിംഗ്, \'ഇപ്പോൾ കേൾക്കുന്നത്\' തുടങ്ങിയവ"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"കൂടുതൽ നിറങ്ങൾ"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index a98ffdb..d4e9f73 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Түгжигдсэн дэлгэцийн текст, Now Playing болон бусад"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 285083d..14a8738 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"लॉक स्क्रीन, Now Playing आणि आणखी बरेच काही यासंबंधित मजकूर"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index a4afdf2..0c248db 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Sembunyikan pemberitahuan pada skrin kunci"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Lagi pilihan"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Teks pada skrin kunci, Now Playing dan pelbagai lagi"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Lagi Warna"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index bb44501..207861d 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"လော့ခ်စကရင် စာသား၊ Now Playing နှင့် နောက်ထပ်ဆက်တင်"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9de167d..bed6a98 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst på låseskjermen, Spilles nå med mer"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c30f787..5a6c95b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -97,7 +97,7 @@
<string name="preset_color_tab" msgid="3133391839341329314">"आधारभूत रङहरू"</string>
<string name="color_changed" msgid="7029571720331641235">"रङ बदलियो"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"गतिशील"</string>
- <string name="color_picker_title" msgid="9150524788313065978">"डिफल्ट रङ"</string>
+ <string name="color_picker_title" msgid="9150524788313065978">"सिस्टमका रङहरू"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"बायाँको सर्टकट"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"दायाँको सर्टकट"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"कुनै पनि होइन"</string>
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"लक स्क्रिनमा सूचनाहरू लुकाइऊन्"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"थप विकल्पहरू"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"लक स्क्रिनमा टेक्स्ट देखिने सुविधा, Now Playing र थप सुविधाहरू"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"थप रङहरू"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b5ed5ed..ccacb42 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Meldingen verbergen op het vergrendelscherm"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Meer opties"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst op vergrendelscherm, Now Playing en meer"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Meer kleuren"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 3ff4d94..54c025b 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"ଲକ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"ଅଧିକ ବିକଳ୍ପ"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ଲକ ସ୍କ୍ରିନରେ ଟେକ୍ସଟ, ଏବେ ଚାଲୁଛି ଏବଂ ଆହୁରି ଅନେକ କିଛି"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"ଅଧିକ ରଙ୍ଗ"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index ced721f..c247e77 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਲਿਖਤ ਸ਼ਾਮਲ ਕਰਨਾ, \'ਹੁਣੇ ਚੱਲ ਰਿਹਾ ਹੈ\' ਅਤੇ ਹੋਰ"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f2762ad..7ace1d9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Ukrywaj powiadomienia na ekranie blokady"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Więcej opcji"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"SMS-y na ekranie blokady, Co jest grane i inne funkcje"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Więcej kolorów"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 129c719..a8ac3e6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Oculte as notificações no ecrã de bloqueio"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Mais opções"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Texto no ecrã de bloqueio, A tocar e muito mais"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Mais cores"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2dae0a1..21f1a23 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Ocultar notificações na tela de bloqueio"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Mais opções"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Texto na tela de bloqueio, Tocando agora e muito mais"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Mais cores"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 101832d..59b4095 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Ascunde notificările pe ecranul de blocare"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Mai multe opțiuni"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text pe ecranul de blocare, Now Playing și altele"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Mai multe culori"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6cf2c77..f9a04c7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Текст на заблок. экране, функция \"Что сейчас играет?\" и др."</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 4173a91..4e01dd5 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"අගුළු තිරය මත පෙළ, දැන් වාදනය වීම, සහ තවත් දේ"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7c155d6..072b5d1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Skrývať upozornenia na uzamknutej obrazovke"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Ďalšie možnosti"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text na uzamknutej obrazovke, Čo to hrá a ďalšie nastavenia"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Ďalšie farby"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5b7d51a..9c0839c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Skrivanje obvestil na zaklenjenem zaslonu"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Več možnosti"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Besedilo na zaklenjenem zaslonu, Zdaj se predvaja in drugo"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Več barv"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 2cbbd09..340c355 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Fshih njoftimet në ekranin e kyçjes"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Opsione të tjera"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Tekst në ekranin e kyçjes, \"Gjej këngën\" dhe të tjera"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Më shumë ngjyra"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 682db41..ce55d06 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Сакриј обавештења на закључаном екрану"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Још опција"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Текст на закључаном екрану, Тренутно свира и друго"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Још боја"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 38c63ea..ca0dd24 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Text på låsskärmen, Nu spelas med mera"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1af2623..8a7d9cc 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Maandishi kwenye skrini iliyofungwa, Kitambua Ngoma na zaidi"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 8e95331..d313af0 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"பூட்டுத் திரையில் உரை, பாடல் விவரம் மற்றும் பல"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 354a85b..593f3bc 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"లాక్ స్క్రీన్లో నోటిఫికేషన్లను దాచండి"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"మరిన్ని ఆప్షన్లు"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"లాక్ స్క్రీన్, Now Playing, మరిన్ని కోసం టెక్స్ట్ మెసేజ్ పంపండి"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"మరిన్ని రంగులు"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9422bb3..324a31b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"ซ่อนการแจ้งเตือนบนหน้าจอล็อก"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"ตัวเลือกเพิ่มเติม"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"ข้อความบนหน้าจอล็อก \"กำลังเล่น\" และอื่นๆ"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"สีเพิ่มเติม"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4566074..36da9e9 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Itago ang mga notification sa lock screen"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Higit pang opsyon"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Text sa lock screen, Nagpi-play Ngayon, at higit pa"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Higit Pang Kulay"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e222415..15a40c1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Kilit ekranındaki metin, Ne Çalıyor? ve daha fazlası"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ce941bd..4d6ba51 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"Текст на заблокованому екрані, функція \"Зараз грає\" тощо"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index e661ff7..283ecb8 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"مقفل اسکرین پر اطلاعات چھپائیں"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"مزید اختیارات"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"لاک اسکرین پر ٹیکسٹ، ابھی Now Playing اور مزید"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"مزید رنگ"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 36749bf..3dbd358 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Ekran qulfida bildirishnomalarni berkitish"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Boshqa parametrlar"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Ekran qulfidagi matn, Bu qaysi musiqa va boshqalar"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Boshqa ranglar"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e5d2e9d..1c9f1b7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Ẩn thông báo trên màn hình khoá"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Tuỳ chọn khác"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Văn bản trên màn hình khoá, Phát hiện nhạc, v.v."</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Màu khác"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 77bb492..9d824bf 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"在锁定屏幕上添加文字、闻曲知音和其他设置"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5ba7c9d..078bf47 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"在上鎖畫面發短訊、使用「歌曲識別」功能等"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5314475..9ebfc39 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -116,4 +116,8 @@
<string name="more_settings_section_description" msgid="8787768566854880683">"「在螢幕鎖定畫面上顯示特定文字」、「聽聲辨曲」和其他設定"</string>
<!-- no translation found for more_colors (3191071655353004591) -->
<skip />
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
+ <skip />
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 73b0ef3..f877925 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -114,6 +114,9 @@
<string name="hide_notifications_on_lock_screen" msgid="7413548956484779174">"Fihla izaziso esikrinini sokukhiya"</string>
<string name="more_settings_section_title" msgid="8524741850115625404">"Okunye ongakhetha kukho"</string>
<string name="more_settings_section_description" msgid="8787768566854880683">"Umbhalo esikrinini sokukhiya, Okudlala Manje, nokuningi"</string>
- <!-- no translation found for more_colors (3191071655353004591) -->
+ <string name="more_colors" msgid="3191071655353004591">"Imibala Eyengeziwe"</string>
+ <!-- no translation found for content_description_default_color_option (7011899327541080695) -->
+ <skip />
+ <!-- no translation found for content_description_color_option (4169813692012119578) -->
<skip />
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index febca46..b856c35 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -153,7 +153,7 @@
<!-- Width of a single selectable item in the lock screen quick affordance picker. -->
<dimen name="keyguard_quick_affordance_picker_item_width">74dp</dimen>
- <dimen name="clock_carousel_item_small_size">100dp</dimen>
- <dimen name="clock_carousel_item_large_size">120dp</dimen>
- <dimen name="clock_carousel_item_margin">32dp</dimen>
+ <dimen name="clock_carousel_item_width">190dp</dimen>
+ <dimen name="clock_carousel_item_height">380dp</dimen>
+ <dimen name="clock_carousel_item_margin">16dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f4d525e..c1bdc54 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,7 +33,7 @@
<!-- The content description of clock entry. [CHAR LIMIT=NONE] -->
<string name="clock_picker_entry_content_description">Change a custom clock</string>
- <!-- Title of a section of the customization picker where the user can configure Clock face. [CHAR LIMIT=15] -->
+ <!-- Title of a section of the customization picker where the user can configure Clock face. [CHAR LIMIT=19] -->
<string name="clock_settings_title">Clock Settings</string>
<!-- Title of a tab to change the clock color. [CHAR LIMIT=15] -->
@@ -51,6 +51,9 @@
<!-- Title of a radio button to apply clock size large. [CHAR LIMIT=15] -->
<string name="clock_size_large">Large</string>
+ <!-- Title of a radio button to apply clock size small. [CHAR LIMIT=15] -->
+ <string name="clock_size_small">Small</string>
+
<!-- Title of a section of the customization picker where the user can select a Grid size for
the home screen. [CHAR LIMIT=15] -->
<string name="grid_title">App grid</string>
@@ -420,4 +423,22 @@
[CHAR LIMIT=128].
-->
<string name="more_colors">More Colors</string>
+
+ <!--
+ Accessibility string for a button that allows the user to select the default color for their
+ lock screen clock on the device. This is shown next to other buttons that allow the user to
+ select from a set of custom colors.
+
+ [CHAR LIMIT=NONE].
+ -->
+ <string name="content_description_default_color_option">Default color option</string>
+
+ <!--
+ Accessibility string for a button that allows the user to select a custom color for their lock
+ screen clock on the device. This is shown next to other such buttons that allow the user to
+ select from a set of custom colors.
+
+ [CHAR LIMIT=NONE].
+ -->
+ <string name="content_description_color_option">Color option <xliff:g name="color_number" example="1">%1$d</xliff:g></string>
</resources>
diff --git a/res/xml/carousel_scene.xml b/res/xml/carousel_scene.xml
index 345f690..8c6738b 100644
--- a/res/xml/carousel_scene.xml
+++ b/res/xml/carousel_scene.xml
@@ -40,94 +40,82 @@
<ConstraintSet android:id="@+id/previous">
<Constraint
android:id="@+id/item_view_0"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginEnd="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_1"
- android:layout_width="0dp"
- android:layout_height="0dp"
- motion:layout_constraintDimensionRatio="1:1"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
- motion:layout_constraintStart_toStartOf="@id/guideline_start"
- motion:layout_constraintEnd_toEndOf="@id/guideline_end"
+ motion:layout_constraintStart_toStartOf="parent"
+ motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="@dimen/clock_carousel_item_margin"
- android:layout_marginEnd="@dimen/clock_carousel_item_margin" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_2"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>
<ConstraintSet android:id="@+id/start">
<Constraint
android:id="@+id/item_view_1"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginEnd="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_2"
- android:layout_width="0dp"
- android:layout_height="0dp"
- motion:layout_constraintDimensionRatio="1:1"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
- motion:layout_constraintStart_toStartOf="@id/guideline_start"
- motion:layout_constraintEnd_toEndOf="@id/guideline_end"
+ motion:layout_constraintStart_toStartOf="parent"
+ motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="@dimen/clock_carousel_item_margin"
- android:layout_marginEnd="@dimen/clock_carousel_item_margin" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_3"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>
<ConstraintSet android:id="@+id/next">
<Constraint
android:id="@+id/item_view_2"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintEnd_toStartOf="@id/guideline_start"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginEnd="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_3"
- android:layout_width="0dp"
- android:layout_height="0dp"
- motion:layout_constraintDimensionRatio="1:1"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
+ motion:layout_constraintWidth_max="@dimen/clock_carousel_item_width"
motion:layout_constraintHorizontal_bias="0.5"
- motion:layout_constraintStart_toStartOf="@id/guideline_start"
- motion:layout_constraintEnd_toEndOf="@id/guideline_end"
+ motion:layout_constraintStart_toStartOf="parent"
+ motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="@dimen/clock_carousel_item_margin"
- android:layout_marginEnd="@dimen/clock_carousel_item_margin" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
<Constraint
android:id="@+id/item_view_4"
- android:layout_width="@dimen/clock_carousel_item_small_size"
- android:layout_height="@dimen/clock_carousel_item_small_size"
+ android:layout_width="@dimen/clock_carousel_item_width"
+ android:layout_height="@dimen/clock_carousel_item_height"
motion:layout_constraintStart_toStartOf="@id/guideline_end"
motion:layout_constraintTop_toTopOf="parent"
- motion:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="16dp" />
+ motion:layout_constraintBottom_toBottomOf="parent" />
</ConstraintSet>
</MotionScene>
\ No newline at end of file
diff --git a/src/com/android/customization/module/CustomizationInjector.kt b/src/com/android/customization/module/CustomizationInjector.kt
index 900431e..90a213b 100644
--- a/src/com/android/customization/module/CustomizationInjector.kt
+++ b/src/com/android/customization/module/CustomizationInjector.kt
@@ -15,6 +15,7 @@
*/
package com.android.customization.module
+import android.app.Activity
import android.content.Context
import androidx.fragment.app.FragmentActivity
import com.android.customization.model.theme.OverlayManagerCompat
@@ -25,6 +26,7 @@
import com.android.customization.picker.clock.ui.view.ClockViewFactory
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel
+import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor
import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor
@@ -74,7 +76,12 @@
): ClockCarouselViewModel
fun getClockViewFactory(
- context: Context,
+ activity: Activity,
registry: ClockRegistry,
): ClockViewFactory
+
+ fun getClockSettingsViewModelFactory(
+ context: Context,
+ registry: ClockRegistry,
+ ): ClockSettingsViewModel.Factory
}
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index b3756c1..f042c79 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -15,6 +15,7 @@
*/
package com.android.customization.module
+import android.app.Activity
import android.app.UiModeManager
import android.content.Context
import android.content.Intent
@@ -38,6 +39,7 @@
import com.android.customization.picker.clock.ui.view.ClockViewFactory
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel
+import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
import com.android.customization.picker.color.data.repository.ColorPickerRepositoryImpl
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor
import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel
@@ -96,6 +98,7 @@
private var darkModeSnapshotRestorer: DarkModeSnapshotRestorer? = null
private var themedIconSnapshotRestorer: ThemedIconSnapshotRestorer? = null
private var themedIconInteractor: ThemedIconInteractor? = null
+ private var clockSettingsViewModelFactory: ClockSettingsViewModel.Factory? = null
override fun getCustomizationSections(activity: ComponentActivity): CustomizationSections {
return customizationSections
@@ -123,7 +126,7 @@
object : ClockViewFactoryProvider {
override fun get(registry: ClockRegistry): ClockViewFactory {
return getClockViewFactory(
- context = activity,
+ activity = activity,
registry = registry,
)
}
@@ -301,10 +304,11 @@
return clockPickerInteractor
?: ClockPickerInteractor(
ClockPickerRepositoryImpl(
+ secureSettingsRepository = getSecureSettingsRepository(context),
registry = clockRegistry,
scope = GlobalScope,
backgroundDispatcher = Dispatchers.IO,
- )
+ ),
)
.also { clockPickerInteractor = it }
}
@@ -330,11 +334,11 @@
}
override fun getClockViewFactory(
- context: Context,
+ activity: Activity,
registry: ClockRegistry,
): ClockViewFactory {
return clockViewFactory
- ?: ClockViewFactory(context, registry).also { clockViewFactory = it }
+ ?: ClockViewFactory(activity, registry).also { clockViewFactory = it }
}
protected fun getNotificationsInteractor(
@@ -409,6 +413,18 @@
.also { themedIconInteractor = it }
}
+ override fun getClockSettingsViewModelFactory(
+ context: Context,
+ registry: ClockRegistry,
+ ): ClockSettingsViewModel.Factory {
+ return clockSettingsViewModelFactory
+ ?: ClockSettingsViewModel.Factory(
+ context,
+ getClockPickerInteractor(context, registry),
+ )
+ .also { clockSettingsViewModelFactory = it }
+ }
+
companion object {
@JvmStatic
private val KEY_QUICK_AFFORDANCE_SNAPSHOT_RESTORER =
diff --git a/src/com/android/customization/picker/HorizontalTouchMovementAwareNestedScrollView.kt b/src/com/android/customization/picker/HorizontalTouchMovementAwareNestedScrollView.kt
new file mode 100644
index 0000000..06cf753
--- /dev/null
+++ b/src/com/android/customization/picker/HorizontalTouchMovementAwareNestedScrollView.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.customization.picker
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import androidx.core.widget.NestedScrollView
+import kotlin.math.abs
+
+/**
+ * This nested scroll view will detect horizontal touch movements and stop vertical scrolls when a
+ * horizontal touch movement is detected.
+ */
+class HorizontalTouchMovementAwareNestedScrollView(context: Context, attrs: AttributeSet?) :
+ NestedScrollView(context, attrs) {
+
+ private var startXPosition = 0f
+ private var startYPosition = 0f
+ private var isHorizontalTouchMovement = false
+
+ override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+ when (event.action) {
+ MotionEvent.ACTION_DOWN -> {
+ startXPosition = event.x
+ startYPosition = event.y
+ isHorizontalTouchMovement = false
+ }
+ MotionEvent.ACTION_MOVE -> {
+ val xMoveDistance = abs(event.x - startXPosition)
+ val yMoveDistance = abs(event.y - startYPosition)
+ if (
+ !isHorizontalTouchMovement &&
+ xMoveDistance > yMoveDistance &&
+ xMoveDistance > ViewConfiguration.get(context).scaledTouchSlop
+ ) {
+ isHorizontalTouchMovement = true
+ }
+ }
+ else -> {}
+ }
+ return if (isHorizontalTouchMovement) {
+ // We only want to intercept the touch event when the touch moves more vertically than
+ // horizontally. So we return false.
+ false
+ } else {
+ super.onInterceptTouchEvent(event)
+ }
+ }
+}
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
index 1904197..690b649 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
@@ -35,5 +35,5 @@
fun setClockColor(color: Int?)
- fun setClockSize(size: ClockSize)
+ suspend fun setClockSize(size: ClockSize)
}
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
index 9e140aa..6c845f9 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
@@ -16,24 +16,29 @@
*/
package com.android.customization.picker.clock.data.repository
+import android.provider.Settings
import android.util.Log
import com.android.customization.picker.clock.shared.ClockSize
import com.android.customization.picker.clock.shared.model.ClockMetadataModel
import com.android.systemui.plugins.ClockMetadata
import com.android.systemui.shared.clocks.ClockRegistry
+import com.android.wallpaper.settings.data.repository.SecureSettingsRepository
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
/** Implementation of [ClockPickerRepository], using [ClockRegistry]. */
class ClockPickerRepositoryImpl(
+ private val secureSettingsRepository: SecureSettingsRepository,
private val registry: ClockRegistry,
private val scope: CoroutineScope,
private val backgroundDispatcher: CoroutineDispatcher,
@@ -66,7 +71,12 @@
trySend(model)
}
- val listener = ClockRegistry.ClockChangeListener { scope.launch { send() } }
+ val listener =
+ object : ClockRegistry.ClockChangeListener {
+ override fun onCurrentClockChanged() {
+ scope.launch { send() }
+ }
+ }
registry.registerClockChangeListener(listener)
send()
awaitClose { registry.unregisterClockChangeListener(listener) }
@@ -81,12 +91,26 @@
registry.seedColor = color
}
- // TODO(b/262924055): Use the shared system UI component to query the clock size
- private val _selectedClockSize = MutableStateFlow(ClockSize.DYNAMIC)
- override val selectedClockSize: Flow<ClockSize> = _selectedClockSize.asStateFlow()
+ override val selectedClockSize: SharedFlow<ClockSize> =
+ secureSettingsRepository
+ .intSetting(
+ name = Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,
+ )
+ .map { setting -> setting == 1 }
+ .map { isDynamic -> if (isDynamic) ClockSize.DYNAMIC else ClockSize.SMALL }
+ .shareIn(
+ scope = scope,
+ started = SharingStarted.WhileSubscribed(),
+ replay = 1,
+ )
- override fun setClockSize(size: ClockSize) {
- _selectedClockSize.value = size
+ override suspend fun setClockSize(size: ClockSize) {
+ withContext(backgroundDispatcher) {
+ secureSettingsRepository.set(
+ name = Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,
+ value = if (size == ClockSize.DYNAMIC) 1 else 0,
+ )
+ }
}
private fun ClockMetadata.toModel(color: Int?): ClockMetadataModel {
diff --git a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
index 846ea21..c12778b 100644
--- a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
+++ b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
@@ -44,7 +44,7 @@
repository.setClockColor(color)
}
- fun setClockSize(size: ClockSize) {
+ suspend fun setClockSize(size: ClockSize) {
repository.setClockSize(size)
}
}
diff --git a/src/com/android/customization/picker/clock/shared/ClockSize.kt b/src/com/android/customization/picker/clock/shared/ClockSize.kt
index 91c5cd4..279ee54 100644
--- a/src/com/android/customization/picker/clock/shared/ClockSize.kt
+++ b/src/com/android/customization/picker/clock/shared/ClockSize.kt
@@ -18,5 +18,5 @@
enum class ClockSize {
DYNAMIC,
- LARGE,
+ SMALL,
}
diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
index 4e838aa..ecbb901 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
@@ -16,6 +16,7 @@
package com.android.customization.picker.clock.ui.binder
import android.view.View
+import android.widget.SeekBar
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.lifecycle.Lifecycle
@@ -41,22 +42,11 @@
lifecycleOwner: LifecycleOwner,
) {
val tabView: RecyclerView = view.requireViewById(R.id.tabs)
- val colorOptionContainer = view.requireViewById<View>(R.id.color_picker_container)
- val sizeOptions =
- view.requireViewById<ClockSizeRadioButtonGroup>(R.id.clock_size_radio_button_group)
-
val tabAdapter = ClockSettingsTabAdapter()
tabView.adapter = tabAdapter
tabView.layoutManager = LinearLayoutManager(view.context, RecyclerView.HORIZONTAL, false)
tabView.addItemDecoration(ItemSpacing(ItemSpacing.TAB_ITEM_SPACING_DP))
- sizeOptions.onRadioButtonClickListener =
- object : ClockSizeRadioButtonGroup.OnRadioButtonClickListener {
- override fun onClick(size: ClockSize) {
- viewModel.setClockSize(size)
- }
- }
-
val colorOptionContainerView: RecyclerView = view.requireViewById(R.id.color_options)
val colorOptionAdapter = ColorOptionAdapter()
colorOptionContainerView.adapter = colorOptionAdapter
@@ -64,6 +54,30 @@
LinearLayoutManager(view.context, RecyclerView.HORIZONTAL, false)
colorOptionContainerView.addItemDecoration(ItemSpacing(ItemSpacing.ITEM_SPACING_DP))
+ val slider: SeekBar = view.requireViewById(R.id.slider)
+ slider.setOnSeekBarChangeListener(
+ object : SeekBar.OnSeekBarChangeListener {
+ override fun onProgressChanged(p0: SeekBar?, progress: Int, fromUser: Boolean) {
+ if (fromUser) {
+ viewModel.onSliderProgressChanged(progress)
+ }
+ }
+
+ override fun onStartTrackingTouch(p0: SeekBar?) = Unit
+ override fun onStopTrackingTouch(p0: SeekBar?) = Unit
+ }
+ )
+
+ val sizeOptions =
+ view.requireViewById<ClockSizeRadioButtonGroup>(R.id.clock_size_radio_button_group)
+ sizeOptions.onRadioButtonClickListener =
+ object : ClockSizeRadioButtonGroup.OnRadioButtonClickListener {
+ override fun onClick(size: ClockSize) {
+ viewModel.setClockSize(size)
+ }
+ }
+
+ val colorOptionContainer = view.requireViewById<View>(R.id.color_picker_container)
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
launch { viewModel.tabs.collect { tabAdapter.setItems(it) } }
@@ -94,15 +108,27 @@
when (size) {
ClockSize.DYNAMIC -> {
sizeOptions.radioButtonDynamic.isChecked = true
- sizeOptions.radioButtonLarge.isChecked = false
+ sizeOptions.radioButtonSmall.isChecked = false
}
- ClockSize.LARGE -> {
+ ClockSize.SMALL -> {
sizeOptions.radioButtonDynamic.isChecked = false
- sizeOptions.radioButtonLarge.isChecked = true
+ sizeOptions.radioButtonSmall.isChecked = true
}
}
}
}
+
+ launch {
+ viewModel.sliderProgress.collect { progress ->
+ progress?.let { slider.setProgress(progress, false) }
+ }
+ }
+
+ launch {
+ viewModel.isSliderEnabled.collect { isEnabled ->
+ slider.isInvisible = !isEnabled
+ }
+ }
}
}
}
diff --git a/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt b/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
index d716102..c25f6e6 100644
--- a/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
+++ b/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
@@ -27,7 +27,6 @@
import com.android.customization.picker.clock.ui.binder.ClockCarouselViewBinder
import com.android.customization.picker.clock.ui.binder.ClockSettingsBinder
import com.android.customization.picker.clock.ui.view.ClockCarouselView
-import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants
import com.android.wallpaper.R
import com.android.wallpaper.model.WallpaperColorsViewModel
@@ -121,7 +120,7 @@
lifecycleScope.launch {
val registry =
withContext(Dispatchers.IO) { injector.getClockRegistryProvider(context).get() }
- val clockViewFactory = injector.getClockViewFactory(context, registry)
+ val clockViewFactory = injector.getClockViewFactory(activity, registry)
ClockCarouselViewBinder.bind(
view = carouselView,
viewModel = injector.getClockCarouselViewModel(context, registry),
@@ -131,10 +130,14 @@
.show()
ClockSettingsBinder.bind(
view,
- ClockSettingsViewModel(
- context,
- injector.getClockPickerInteractor(context, registry)
- ),
+ ViewModelProvider(
+ requireActivity(),
+ injector.getClockSettingsViewModelFactory(
+ context = context,
+ registry = registry,
+ ),
+ )
+ .get(),
this@ClockSettingsFragment,
)
}
diff --git a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
index 2771b12..e16492f 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
@@ -22,6 +22,7 @@
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.constraintlayout.helper.widget.Carousel
+import androidx.core.view.get
import com.android.wallpaper.R
class ClockCarouselView(
@@ -67,13 +68,14 @@
}
override fun populate(view: View?, index: Int) {
- val viewGroup = view as ViewGroup
- viewGroup.removeAllViews()
+ val viewRoot = view as ViewGroup
+ val clockHostView = viewRoot[0] as ViewGroup
+ clockHostView.removeAllViews()
val clockView = onGetClockPreview(clockIds[index])
// The clock view might still be attached to an existing parent. Detach before adding to
// another parent.
(clockView.parent as? ViewGroup)?.removeView(clockView)
- viewGroup.addView(clockView)
+ clockHostView.addView(clockView)
}
override fun onNewItem(index: Int) {
diff --git a/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt b/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt
index fcf8904..909491a 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt
@@ -35,7 +35,7 @@
}
val radioButtonDynamic: RadioButton
- val radioButtonLarge: RadioButton
+ val radioButtonSmall: RadioButton
var onRadioButtonClickListener: OnRadioButtonClickListener? = null
init {
@@ -43,8 +43,8 @@
radioButtonDynamic = requireViewById(R.id.radio_button_dynamic)
val buttonDynamic = requireViewById<View>(R.id.button_container_dynamic)
buttonDynamic.setOnClickListener { onRadioButtonClickListener?.onClick(ClockSize.DYNAMIC) }
- radioButtonLarge = requireViewById(R.id.radio_button_large)
- val buttonLarge = requireViewById<View>(R.id.button_container_large)
- buttonLarge.setOnClickListener { onRadioButtonClickListener?.onClick(ClockSize.LARGE) }
+ radioButtonSmall = requireViewById(R.id.radio_button_large)
+ val buttonLarge = requireViewById<View>(R.id.button_container_small)
+ buttonLarge.setOnClickListener { onRadioButtonClickListener?.onClick(ClockSize.SMALL) }
}
}
diff --git a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
index 8f4fb28..488dd08 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
@@ -1,14 +1,32 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.android.customization.picker.clock.ui.view
-import android.content.Context
+import android.app.Activity
import android.view.View
import com.android.systemui.plugins.ClockController
import com.android.systemui.shared.clocks.ClockRegistry
-import java.util.HashMap
+import com.android.wallpaper.R
+import com.android.wallpaper.util.ScreenSizeCalculator
-class ClockViewFactory(private val context: Context, private val registry: ClockRegistry) {
- private val clockControllers: HashMap<String, ClockController> =
- HashMap<String, ClockController>()
+class ClockViewFactory(
+ private val activity: Activity,
+ private val registry: ClockRegistry,
+) {
+ private val clockControllers: HashMap<String, ClockController> = HashMap()
fun getView(clockId: String): View {
return (clockControllers[clockId] ?: initClockController(clockId)).largeClock.view
@@ -16,8 +34,17 @@
private fun initClockController(clockId: String): ClockController {
val controller =
- registry.createExampleClock(clockId).also { it?.initialize(context.resources, 0f, 0f) }
+ registry.createExampleClock(clockId).also { it?.initialize(activity.resources, 0f, 0f) }
checkNotNull(controller)
+ val screenSizeCalculator = ScreenSizeCalculator.getInstance()
+ val screenSize = screenSizeCalculator.getScreenSize(activity.windowManager.defaultDisplay)
+ val ratio =
+ activity.resources.getDimensionPixelSize(R.dimen.screen_preview_height).toFloat() /
+ screenSize.y.toFloat()
+ controller.largeClock.events.onFontSettingChanged(
+ activity.resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat() *
+ ratio
+ )
clockControllers[clockId] = controller
return controller
}
diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
index 11e0273..1ffb7b8 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
@@ -17,69 +17,180 @@
import android.content.Context
import android.graphics.Color
+import androidx.core.graphics.ColorUtils
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor
import com.android.customization.picker.clock.shared.ClockSize
import com.android.customization.picker.color.ui.viewmodel.ColorOptionViewModel
import com.android.wallpaper.R
+import kotlin.math.abs
+import kotlin.math.roundToInt
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
/** View model for the clock settings screen. */
-class ClockSettingsViewModel(val context: Context, val interactor: ClockPickerInteractor) {
+class ClockSettingsViewModel
+private constructor(context: Context, private val interactor: ClockPickerInteractor) : ViewModel() {
enum class Tab {
COLOR,
SIZE,
}
- val colorOptions: Flow<List<ColorOptionViewModel>> =
- interactor.selectedClockColor.map { selectedColor ->
- buildList {
- // TODO (b/241966062) Change design of the placeholder for default theme color
- add(
- ColorOptionViewModel(
- color0 = Color.TRANSPARENT,
- color1 = Color.TRANSPARENT,
- color2 = Color.TRANSPARENT,
- color3 = Color.TRANSPARENT,
- contentDescription = "description",
- isSelected = selectedColor == null,
- onClick =
- if (selectedColor == null) {
- null
- } else {
- { interactor.setClockColor(null) }
- },
- )
- )
- COLOR_LIST.forEach { color ->
+ private val helperColorHsl: FloatArray by lazy { FloatArray(3) }
+
+ /**
+ * Saturation level of the current selected color. Note that this can be null if the selected
+ * color is null, which means that the clock color respects the system theme color. In this
+ * case, the saturation level is no longer needed since we do not allow changing saturation
+ * level of the system theme color.
+ */
+ private val saturationLevel: Flow<Float?> =
+ interactor.selectedClockColor
+ .map { selectedColor ->
+ if (selectedColor == null) {
+ null
+ } else {
+ ColorUtils.colorToHSL(selectedColor, helperColorHsl)
+ helperColorHsl[1]
+ }
+ }
+ .shareIn(
+ scope = viewModelScope,
+ started = SharingStarted.WhileSubscribed(),
+ replay = 1,
+ )
+
+ /**
+ * When the selected clock color is null, it means that the clock will respect the system theme
+ * color. And we no longer need the slider, which determines the saturation level of the clock's
+ * overridden color.
+ */
+ val isSliderEnabled: Flow<Boolean> = saturationLevel.map { it != null }
+
+ /**
+ * Slide progress from 0 to 100. Note that this can be null if the selected color is null, which
+ * means that the clock color respects the system theme color. In this case, the saturation
+ * level is no longer needed since we do not allow changing saturation level of the system theme
+ * color.
+ */
+ val sliderProgress: Flow<Int?> =
+ saturationLevel.map { saturation -> saturation?.let { (it * 100).roundToInt() } }
+
+ fun onSliderProgressChanged(progress: Int) {
+ val saturation = progress / 100f
+ val selectedOption = colorOptions.value.find { option -> option.isSelected }
+ selectedOption?.let { option ->
+ ColorUtils.colorToHSL(option.color0, helperColorHsl)
+ helperColorHsl[1] = saturation
+ interactor.setClockColor(ColorUtils.HSLToColor(helperColorHsl))
+ }
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ val colorOptions: StateFlow<List<ColorOptionViewModel>> =
+ interactor.selectedClockColor
+ .mapLatest { selectedColor ->
+ // Use mapLatest and delay(100) here to prevent too many selectedClockColor update
+ // events from ClockRegistry upstream, caused by sliding the saturation level bar.
+ delay(COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
+ buildList {
+ // TODO (b/241966062) Change design of the placeholder for default theme color
add(
ColorOptionViewModel(
- color0 = color,
- color1 = color,
- color2 = color,
- color3 = color,
- contentDescription = "description",
- isSelected = selectedColor == color,
+ color0 = Color.TRANSPARENT,
+ color1 = Color.TRANSPARENT,
+ color2 = Color.TRANSPARENT,
+ color3 = Color.TRANSPARENT,
+ contentDescription =
+ context.getString(
+ R.string.content_description_color_option,
+ ),
+ isSelected = selectedColor == null,
onClick =
- if (selectedColor == color) {
+ if (selectedColor == null) {
null
} else {
- { interactor.setClockColor(color) }
+ { interactor.setClockColor(null) }
},
)
)
+
+ if (selectedColor != null) {
+ ColorUtils.colorToHSL(selectedColor, helperColorHsl)
+ }
+
+ val selectedColorPosition =
+ if (selectedColor != null) {
+ getSelectedColorPosition(helperColorHsl)
+ } else {
+ -1
+ }
+
+ COLOR_LIST_HSL.forEachIndexed { index, colorHSL ->
+ val color = ColorUtils.HSLToColor(colorHSL)
+ val isSelected = selectedColorPosition == index
+ val colorToSet: Int by lazy {
+ val saturation =
+ if (selectedColor != null) {
+ helperColorHsl[1]
+ } else {
+ colorHSL[1]
+ }
+ ColorUtils.HSLToColor(
+ listOf(
+ colorHSL[0],
+ saturation,
+ colorHSL[2],
+ )
+ .toFloatArray()
+ )
+ }
+ add(
+ ColorOptionViewModel(
+ color0 = color,
+ color1 = color,
+ color2 = color,
+ color3 = color,
+ contentDescription =
+ context.getString(
+ R.string.content_description_color_option,
+ index,
+ ),
+ isSelected = isSelected,
+ onClick =
+ if (isSelected) {
+ null
+ } else {
+ { interactor.setClockColor(colorToSet) }
+ },
+ )
+ )
+ }
}
}
- }
+ .stateIn(
+ scope = viewModelScope,
+ started = SharingStarted.WhileSubscribed(),
+ initialValue = emptyList(),
+ )
val selectedClockSize: Flow<ClockSize> = interactor.selectedClockSize
fun setClockSize(size: ClockSize) {
- interactor.setClockSize(size)
+ viewModelScope.launch { interactor.setClockSize(size) }
}
private val _selectedTabPosition = MutableStateFlow(Tab.COLOR)
@@ -113,6 +224,32 @@
companion object {
// TODO (b/241966062) The color integers here are temporary for dev purposes. We need to
// finalize the overridden colors.
- val COLOR_LIST = listOf(-2563329, -8775, -1777665, -5442872)
+ val COLOR_LIST_HSL =
+ listOf(
+ arrayOf(225f, 0.65f, 0.74f).toFloatArray(),
+ arrayOf(30f, 0.65f, 0.74f).toFloatArray(),
+ arrayOf(249f, 0.65f, 0.74f).toFloatArray(),
+ arrayOf(144f, 0.65f, 0.74f).toFloatArray(),
+ )
+
+ val COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS: Long = 100
+
+ fun getSelectedColorPosition(selectedColorHsl: FloatArray): Int {
+ return COLOR_LIST_HSL.withIndex().minBy { abs(it.value[0] - selectedColorHsl[0]) }.index
+ }
+ }
+
+ class Factory(
+ private val context: Context,
+ private val interactor: ClockPickerInteractor,
+ ) : ViewModelProvider.Factory {
+ override fun <T : ViewModel> create(modelClass: Class<T>): T {
+ @Suppress("UNCHECKED_CAST")
+ return ClockSettingsViewModel(
+ context = context,
+ interactor = interactor,
+ )
+ as T
+ }
}
}
diff --git a/src/com/android/customization/picker/color/data/repository/ColorPickerRepository.kt b/src/com/android/customization/picker/color/data/repository/ColorPickerRepository.kt
index c375574..0e65577 100644
--- a/src/com/android/customization/picker/color/data/repository/ColorPickerRepository.kt
+++ b/src/com/android/customization/picker/color/data/repository/ColorPickerRepository.kt
@@ -25,7 +25,15 @@
* system color.
*/
interface ColorPickerRepository {
+ /**
+ * The newly selected color option for overwriting the current active option during an
+ * optimistic update, the value is null when no overwriting is needed
+ */
+ val activeColorOption: Flow<ColorOptionModel?>
+
+ /** List of wallpaper and preset color options on the device, categorized by Color Type */
val colorOptions: Flow<Map<ColorType, List<ColorOptionModel>>>
+ /** Selects a color option with optimistic update */
fun select(colorOptionModel: ColorOptionModel)
}
diff --git a/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt b/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
index 4ce5ed9..d6d5060 100644
--- a/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
@@ -29,7 +29,9 @@
import com.android.customization.picker.color.shared.model.ColorType
import com.android.wallpaper.model.WallpaperColorsViewModel
import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.suspendCancellableCoroutine
@@ -48,12 +50,17 @@
private val colorManager: ColorCustomizationManager =
ColorCustomizationManager.getInstance(context, OverlayManagerCompat(context))
- /** List of wallpaper and preset color options on the device, categorized by Color Type */
+ private val _activeColorOption = MutableStateFlow<ColorOptionModel?>(null)
+ override val activeColorOption: StateFlow<ColorOptionModel?> = _activeColorOption.asStateFlow()
+
override val colorOptions: Flow<Map<ColorType, List<ColorOptionModel>>> =
- combine(homeWallpaperColors, lockWallpaperColors) { homeColors, lockColors ->
- homeColors to lockColors
+ combine(activeColorOption, homeWallpaperColors, lockWallpaperColors) {
+ activeOption,
+ homeColors,
+ lockColors ->
+ Triple(activeOption, homeColors, lockColors)
}
- .map { (homeColors, lockColors) ->
+ .map { (activeOption, homeColors, lockColors) ->
suspendCancellableCoroutine { continuation ->
colorManager.setWallpaperColors(homeColors, lockColors)
colorManager.fetchOptions(
@@ -66,8 +73,9 @@
options?.forEach { option ->
when (option) {
is ColorSeedOption ->
- wallpaperColorOptions.add(option.toModel())
- is ColorBundle -> presetColorOptions.add(option.toModel())
+ wallpaperColorOptions.add(option.toModel(activeOption))
+ is ColorBundle ->
+ presetColorOptions.add(option.toModel(activeOption))
}
}
continuation.resumeWith(
@@ -95,23 +103,32 @@
}
override fun select(colorOptionModel: ColorOptionModel) {
+ _activeColorOption.value = colorOptionModel
val colorOption: ColorOption = colorOptionModel.colorOption
colorManager.apply(
colorOption,
object : CustomizationManager.Callback {
- override fun onSuccess() = Unit
+ override fun onSuccess() {
+ _activeColorOption.value = null
+ }
override fun onError(throwable: Throwable?) {
+ _activeColorOption.value = null
Log.w(TAG, "Apply theme with error", throwable)
}
}
)
}
- private fun ColorOption.toModel(): ColorOptionModel {
+ private fun ColorOption.toModel(activeColorOption: ColorOptionModel?): ColorOptionModel {
return ColorOptionModel(
colorOption = this,
- isSelected = isActive(colorManager),
+ isSelected =
+ if (activeColorOption != null) {
+ isEquivalent(activeColorOption.colorOption)
+ } else {
+ isActive(colorManager)
+ },
)
}
diff --git a/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt b/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt
index 331d635..d2a25bc 100644
--- a/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt
+++ b/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt
@@ -27,6 +27,9 @@
import kotlinx.coroutines.flow.asStateFlow
class FakeColorPickerRepository(context: Context) : ColorPickerRepository {
+ override val activeColorOption: StateFlow<ColorOptionModel?> =
+ MutableStateFlow<ColorOptionModel?>(null)
+
private val colorSeedOption0: ColorSeedOption =
ColorSeedOption.Builder()
.setLightColors(
diff --git a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
index 186611e..9a31ae9 100644
--- a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
+++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
@@ -65,7 +65,11 @@
displayUtils,
navigator,
) {
+
private var clockCarouselBinding: ClockCarouselViewBinder.Binding? = null
+
+ override val hideLockScreenClockPreview = true
+
override fun createView(context: Context): ScreenPreviewView {
val view = super.createView(context)
val carouselViewStub: ViewStub = view.requireViewById(R.id.clock_carousel_view_stub)
diff --git a/tests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt b/tests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
index c201527..1614c61 100644
--- a/tests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
+++ b/tests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
@@ -35,7 +35,7 @@
ClockMetadataModel(selectedClock.clockId, selectedClock.name, clockColor)
}
- private val _selectedClockSize = MutableStateFlow(ClockSize.LARGE)
+ private val _selectedClockSize = MutableStateFlow(ClockSize.SMALL)
override val selectedClockSize: Flow<ClockSize> = _selectedClockSize.asStateFlow()
override fun setSelectedClock(clockId: String) {
@@ -46,7 +46,7 @@
_clockColor.value = color
}
- override fun setClockSize(size: ClockSize) {
+ override suspend fun setClockSize(size: ClockSize) {
_selectedClockSize.value = size
}
diff --git a/tests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt b/tests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
index a6ad6de..883d68b 100644
--- a/tests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
+++ b/tests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
@@ -42,7 +42,7 @@
underTest.setClockSize(ClockSize.DYNAMIC)
Truth.assertThat(observedClockSize()).isEqualTo(ClockSize.DYNAMIC)
- underTest.setClockSize(ClockSize.LARGE)
- Truth.assertThat(observedClockSize()).isEqualTo(ClockSize.LARGE)
+ underTest.setClockSize(ClockSize.SMALL)
+ Truth.assertThat(observedClockSize()).isEqualTo(ClockSize.SMALL)
}
}
diff --git a/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsTabViewModelTest.kt b/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsTabViewModelTest.kt
index a484027..215e178 100644
--- a/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsTabViewModelTest.kt
+++ b/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsTabViewModelTest.kt
@@ -7,10 +7,12 @@
import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor
import com.android.customization.picker.clock.shared.ClockSize
import com.android.wallpaper.testing.collectLastValue
+import com.google.common.collect.Range
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.advanceTimeBy
import kotlinx.coroutines.test.resetMain
import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.test.setMain
@@ -35,7 +37,11 @@
Dispatchers.setMain(testDispatcher)
context = InstrumentationRegistry.getInstrumentation().targetContext
underTest =
- ClockSettingsViewModel(context, ClockPickerInteractor(FakeClockPickerRepository()))
+ ClockSettingsViewModel.Factory(
+ context = context,
+ interactor = ClockPickerInteractor(FakeClockPickerRepository()),
+ )
+ .create(ClockSettingsViewModel::class.java)
}
@After
@@ -46,22 +52,53 @@
@Test
fun setClockColor() = runTest {
val observedClockColorOptions = collectLastValue(underTest.colorOptions)
+ // Advance COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from colorOptions
+ advanceTimeBy(ClockSettingsViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
assertThat(observedClockColorOptions()!![0].isSelected).isTrue()
assertThat(observedClockColorOptions()!![0].onClick).isNull()
observedClockColorOptions()!![1].onClick?.invoke()
+ // Advance COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from colorOptions
+ advanceTimeBy(ClockSettingsViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
assertThat(observedClockColorOptions()!![1].isSelected).isTrue()
assertThat(observedClockColorOptions()!![1].onClick).isNull()
}
@Test
+ fun setClockSaturation() = runTest {
+ val observedClockColorOptions = collectLastValue(underTest.colorOptions)
+ val observedIsSliderEnabled = collectLastValue(underTest.isSliderEnabled)
+ val observedSliderProgress = collectLastValue(underTest.sliderProgress)
+ // Advance COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from colorOptions
+ advanceTimeBy(ClockSettingsViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
+ assertThat(observedIsSliderEnabled()).isFalse()
+ assertThat(observedSliderProgress()).isNull()
+
+ observedClockColorOptions()!![1].onClick?.invoke()
+ // Advance COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from colorOptions
+ advanceTimeBy(ClockSettingsViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
+ assertThat(observedIsSliderEnabled()).isTrue()
+ val targetProgress = 99
+ underTest.onSliderProgressChanged(targetProgress)
+ advanceTimeBy(ClockSettingsViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
+ assertThat(observedClockColorOptions()!![1].isSelected).isTrue()
+ assertThat(observedSliderProgress())
+ .isIn(
+ Range.closed(
+ targetProgress - 1,
+ targetProgress + 1,
+ )
+ )
+ }
+
+ @Test
fun setClockSize() = runTest {
val observedClockSize = collectLastValue(underTest.selectedClockSize)
underTest.setClockSize(ClockSize.DYNAMIC)
assertThat(observedClockSize()).isEqualTo(ClockSize.DYNAMIC)
- underTest.setClockSize(ClockSize.LARGE)
- assertThat(observedClockSize()).isEqualTo(ClockSize.LARGE)
+ underTest.setClockSize(ClockSize.SMALL)
+ assertThat(observedClockSize()).isEqualTo(ClockSize.SMALL)
}
@Test
diff --git a/tests/src/com/android/customization/testing/TestCustomizationInjector.kt b/tests/src/com/android/customization/testing/TestCustomizationInjector.kt
index 71b2028..0aac5cc 100644
--- a/tests/src/com/android/customization/testing/TestCustomizationInjector.kt
+++ b/tests/src/com/android/customization/testing/TestCustomizationInjector.kt
@@ -1,5 +1,6 @@
package com.android.customization.testing
+import android.app.Activity
import android.content.Context
import androidx.fragment.app.FragmentActivity
import com.android.customization.model.theme.OverlayManagerCompat
@@ -14,6 +15,7 @@
import com.android.customization.picker.clock.ui.view.ClockViewFactory
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel
+import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
import com.android.customization.picker.color.data.repository.ColorPickerRepositoryImpl
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor
import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel
@@ -53,6 +55,7 @@
private var colorPickerInteractor: ColorPickerInteractor? = null
private var colorPickerViewModelFactory: ColorPickerViewModel.Factory? = null
private var clockCarouselViewModel: ClockCarouselViewModel? = null
+ private var clockSettingsViewModelFactory: ClockSettingsViewModel.Factory? = null
override fun getCustomizationPreferences(context: Context): CustomizationPreferences {
return customizationPreferences
@@ -197,9 +200,24 @@
}
}
- override fun getClockViewFactory(context: Context, registry: ClockRegistry): ClockViewFactory {
+ override fun getClockViewFactory(
+ activity: Activity,
+ registry: ClockRegistry
+ ): ClockViewFactory {
return clockViewFactory
- ?: ClockViewFactory(context, registry).also { clockViewFactory = it }
+ ?: ClockViewFactory(activity, registry).also { clockViewFactory = it }
+ }
+
+ override fun getClockSettingsViewModelFactory(
+ context: Context,
+ registry: ClockRegistry
+ ): ClockSettingsViewModel.Factory {
+ return clockSettingsViewModelFactory
+ ?: ClockSettingsViewModel.Factory(
+ context,
+ getClockPickerInteractor(context, registry),
+ )
+ .also { clockSettingsViewModelFactory = it }
}
companion object {