Merge "Color Option Selection Animation Clean up" into udc-dev
diff --git a/res/drawable/clock_color_size_button_background.xml b/res/drawable/clock_color_size_button_background.xml
new file mode 100644
index 0000000..08d1c45
--- /dev/null
+++ b/res/drawable/clock_color_size_button_background.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
+
+ <item android:id="@android:id/mask">
+ <shape android:shape="rectangle">
+ <corners android:radius="@dimen/clock_color_size_button_corner_radius" />
+ <solid android:color="?android:colorControlHighlight" />
+ </shape>
+ </item>
+
+ <item android:drawable="@drawable/clock_color_size_button_background_base" />
+</ripple>
diff --git a/res/drawable/clock_color_size_button_background_base.xml b/res/drawable/clock_color_size_button_background_base.xml
new file mode 100644
index 0000000..2e6f2be
--- /dev/null
+++ b/res/drawable/clock_color_size_button_background_base.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="@dimen/clock_color_size_button_corner_radius" />
+ <solid android:color="@color/color_surface" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..3b9076e
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,26 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960"
+ android:tintMode="multiply"
+ android:tint="@color/color_accent_primary">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Z"/>
+</vector>
diff --git a/res/layout/clock_carousel.xml b/res/layout/clock_carousel.xml
index 35defd6..dbeb4dd 100644
--- a/res/layout/clock_carousel.xml
+++ b/res/layout/clock_carousel.xml
@@ -33,7 +33,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:clipChildren="false" />
</com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
<com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
@@ -47,7 +48,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:clipChildren="false"/>
</com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
<com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
@@ -62,7 +64,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:clipChildren="false"/>
</com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
<com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
@@ -76,7 +79,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:clipChildren="false"/>
</com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
<com.android.wallpaper.picker.DisplayAspectRatioFrameLayout
@@ -90,7 +94,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:clipChildren="false" />
</com.android.wallpaper.picker.DisplayAspectRatioFrameLayout>
<androidx.constraintlayout.helper.widget.Carousel
diff --git a/res/layout/clock_color_and_size_button.xml b/res/layout/clock_color_and_size_button.xml
new file mode 100644
index 0000000..ff5a519
--- /dev/null
+++ b/res/layout/clock_color_and_size_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/clock_color_size_button_min_height"
+ android:background="@drawable/clock_color_size_button_background"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingVertical="@dimen/clock_color_size_button_vertical_padding"
+ android:paddingHorizontal="@dimen/clock_color_size_button_horizontal_padding">
+
+ <ImageView
+ android:layout_width="@dimen/clock_color_size_button_icon_size"
+ android:layout_height="@dimen/clock_color_size_button_icon_size"
+ android:src="@drawable/ic_settings"
+ android:importantForAccessibility="no"
+ android:layout_marginEnd="@dimen/clock_color_size_button_icon_margin_end"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/color_accent_primary"
+ android:text="@string/clock_color_and_size_title" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/color_section_view2.xml b/res/layout/color_section_view2.xml
index 687bcef..851bc5d 100644
--- a/res/layout/color_section_view2.xml
+++ b/res/layout/color_section_view2.xml
@@ -37,7 +37,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingVertical="24dp"
+ android:paddingVertical="20dp"
android:paddingHorizontal="24dp"
android:weightSum="@integer/color_section_num_columns">
<include
diff --git a/res/layout/grid_preview_card.xml b/res/layout/grid_preview_card.xml
index e333ca7..6df8508 100644
--- a/res/layout/grid_preview_card.xml
+++ b/res/layout/grid_preview_card.xml
@@ -38,4 +38,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:importantForAccessibility="noHideDescendants" />
+
+ <View
+ android:id="@+id/grid_fadein_scrim"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:colorSecondary"
+ android:forceHasOverlappingRendering="false"
+ android:importantForAccessibility="no"
+ android:visibility="invisible" />
</androidx.cardview.widget.CardView>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4b5d3a0..f0a2b64 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"تجريبي"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"تغيير شبكة التطبيقات"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"ألوان الخلفية"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"تتطابق الأيقونات والنصوص والمزيد مع الألوان في الخلفية."</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"لون الخلفية"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"الألوان الأساسية"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"ألوان أخرى"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"اختَر أي لون للرموز والساعة وغير ذلك."</string>
<string name="color_changed" msgid="7029571720331641235">"تم تغيير اللون."</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"ألوان ديناميكية"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"ألوان النظام"</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>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 237a075..89c63b5 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Бэта"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Змяніць сетку праграм"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Колеры шпалер"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Значкі, тэкст і іншае адпавядаюць колерам вашых шпалер"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Колер шпалер"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Асноўныя колеры"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Іншыя колеры"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Выбірайце колеры для значкоў, гадзінніка і іншых выяў"</string>
<string name="color_changed" msgid="7029571720331641235">"Колер зменены"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Дынамічны"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Сістэмныя колеры"</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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4653f36..d8ed823 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Juster appgitter"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Baggrundsfarver"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoner, tekst og flere matchende farver på din baggrund"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Baggrundsfarve"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Standardfarver"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Andre farver"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Vælg farver til bl.a. ikoner og uret"</string>
<string name="color_changed" msgid="7029571720331641235">"Farven er ændret"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dynamisk"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Systemfarver"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Venstre genvej"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Højre genvej"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Ingen"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 01a5f4e..8691444 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambiar cuadrícula de apps"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Colores del fondo"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Combina el color de íconos, texto y más con tu fondo"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Color del fondo de pantalla"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Colores básicos"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Otros colores"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Elige un color para tus íconos, tu reloj y mucho más"</string>
<string name="color_changed" msgid="7029571720331641235">"Se cambió el color"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dinámico"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Colores del sistema"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Atajo izquierdo"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Atajo derecho"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Ninguno"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 30dd21c..4be5a22 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beeta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Rakenduste ruudustiku muutmine"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Taustapildi värvid"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoonide, teksti ja muud värvid ühtivad taustapildiga"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Taustapildi värv"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Põhivärvid"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Muud värvid"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Valige oma ikoonide, kella ja muu jaoks mis tahes värv"</string>
<string name="color_changed" msgid="7029571720331641235">"Värvi muudeti"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dünaamiline"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Süsteemi värvid"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Vasak otsetee"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Parem otsetee"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Puudub"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 59ec856..5c72db3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Muuta sovellusruudukkoa"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Taustakuvan värit"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Kuvakkeet, teksti jne. taustakuvan värisiä"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Taustakuvan väri"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Perusvärit"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Muut värit"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Valitse kuvakkeille, kellolle jne. mikä tahansa väri"</string>
<string name="color_changed" msgid="7029571720331641235">"Väri vaihdettu"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dynaaminen"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Järjestelmän värit"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Vasen pikakuvake"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Oikea pikakuvake"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"–"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 69b93b7..2b0aab1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Bêta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Modifier la grille d\'applis"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Couleurs fond d\'écran"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icônes, texte et autres couleurs de votre fond d\'écran"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Couleur du fond d\'écran"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Couleurs de base"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Autres couleurs"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Choisissez une couleur pour vos icônes, l\'horloge, etc."</string>
<string name="color_changed" msgid="7029571720331641235">"Couleur modifiée"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dynamique"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Couleurs système"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Raccourci gauche"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Raccourci droit"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Aucun"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 363ac72..635def8 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambia a grade de aplicacións"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Cores do fondo"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Combina as cores das iconas, o texto e outros co fondo"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Cor do fondo de pantalla"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Cores básicas"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Outras cores"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Elixe unha cor para as iconas, o reloxo e moito máis"</string>
<string name="color_changed" msgid="7029571720331641235">"Cor modificada"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dinámica"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Cores do sistema"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Atallo: Esquerda"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Atallo: Dereita"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Ningunha"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 7a7ff30..4f6db11 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"બીટા"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ઍપ ગ્રિડ બદલો"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"વૉલપેપરના રંગો"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"તમારા વૉલપેપરમાં આઇકન, ટેક્સ્ટ, વગેરેના મેળ ખાતા રંગો"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"વૉલપેપરનો રંગ"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"મૂળભૂત રંગો"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"અન્ય રંગો"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"તમારા આઇકન, ઘડિયાળ, વગેરે માટે કોઈપણ રંગ પસંદ કરો"</string>
<string name="color_changed" msgid="7029571720331641235">"રંગ બદલ્યો છે"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"ડાઇનૅમિક"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"સિસ્ટમના રંગ"</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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 71a1838..ec156b6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambia griglia di app"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Colori di sfondo"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icone, testo e altro si adattano ai colori dello sfondo"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Colore dello sfondo"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Colori di base"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Altri colori"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Scegli un colore per le tue icone, l\'orologio e altro"</string>
<string name="color_changed" msgid="7029571720331641235">"Colore modificato"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dinamica"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Colori di sistema"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Scorciatoia sinistra"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Scorciatoia destra"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Nessuno"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 7cfbbb9..bc5178e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Бета"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Қолданбалар торын өзгерту"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Тұсқағаз түстері"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Белгіше, мәтін және тұсқағаздағы басқа да сәйкес түстер"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Тұсқағаз түсі"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Негізгі түстер"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Басқа түстер"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Белгіше, сағат және т.б. үшін кез келген түс таңдаңыз."</string>
<string name="color_changed" msgid="7029571720331641235">"Түс өзгертілді."</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Динамикалық"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Жүйе түстері"</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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6144b7a..09cfb14 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"베타"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"앱 그리드 변경"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"배경화면 색상"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"아이콘, 텍스트 등의 색상이 배경화면과 일치합니다"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"배경화면 색상"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"기본 색상"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"기타 색상"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"아이콘, 시계 등을 위한 색상을 선택하세요"</string>
<string name="color_changed" msgid="7029571720331641235">"색상 변경됨"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"동적"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"시스템 색상"</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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c02b911..eb41480 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Mainīt lietotņu režģi"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Fona tapetes krāsas"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Saskaņotas ikonu, teksta u.c. krāsas jūsu fona tapetē"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Fona tapetes krāsa"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Pamatkrāsas"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Citas krāsas"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Izvēlieties jebkādu krāsu savām ikonām, pulkstenim utt."</string>
<string name="color_changed" msgid="7029571720331641235">"Krāsa mainīta"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dinamiska"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Sistēmas krāsas"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Saīsne pa kreisi"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Saīsne pa labi"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Nav"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1955d54..564bde5 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Бета"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Променете ја мрежата на апликации"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Бои од тапетот"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Икони, текст и повеќе совпаѓачки бои на тапетот"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Боја на тапет"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Основни бои"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Други бои"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Изберете боја по желба за вашите икони, часовник и друго"</string>
<string name="color_changed" msgid="7029571720331641235">"Бојата е променета"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Динамично"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Системски бои"</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>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 64ecae5..0dab7d6 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"ਬੀਟਾ"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ਐਪ ਗ੍ਰਿਡ ਬਦਲੋ"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"ਵਾਲਪੇਪਰ ਦੇ ਰੰਗ"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ਵਾਲਪੇਪਰ ਵਿੱਚ ਪ੍ਰਤੀਕਾਂ, ਲਿਖਤ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਦੇ ਮੇਲ ਖਾਂਦੇ ਰੰਗ"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"ਵਾਲਪੇਪਰ ਦਾ ਰੰਗ"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"ਮੂਲ ਰੰਗ"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"ਹੋਰ ਰੰਗ"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"ਆਪਣੇ ਪ੍ਰਤੀਕਾਂ, ਘੜੀ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਲਈ ਕੋਈ ਰੰਗ ਚੁਣੋ"</string>
<string name="color_changed" msgid="7029571720331641235">"ਰੰਗ ਬਦਲਿਆ ਗਿਆ"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"ਪਰਿਵਰਤਨਸ਼ੀਲ"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"ਸਿਸਟਮ ਦੇ ਰੰਗ"</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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1402784..aa84451 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Schimbă grila de aplicații"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Culori de fundal"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Culori pentru pictograme, text și altele din imaginea de fundal"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Culoarea imaginii de fundal"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Culori de bază"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Alte culori"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Alege orice culoare pentru pictograme, ceas și altele"</string>
<string name="color_changed" msgid="7029571720331641235">"Culoare modificată"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dinamic"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Culorile sistemului"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Comanda rapidă stânga"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Comanda rapidă dreapta"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Fără"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index b0e13ed..ee2570c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"බීටා"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"යෙදුම් ජාලකය වෙනස් කරන්න"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"වෝල්පේපර වර්ණ"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ඔබේ වෝල්පේපරයේ නිරූපක, පෙළ, සහ තවත් ගැළපුම් වර්ණ"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"වෝල්පේපර වර්ණය"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"මූලික වර්ණ"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"වෙනත් වර්ණ"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"ඔබේ නිරූපක, ඔරලෝසු, සහ තව දේ සඳහා ඕනෑ වර්ණයක් තෝරා ගන්න"</string>
<string name="color_changed" msgid="7029571720331641235">"වර්ණය වෙනස් විය"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"ගතික"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"පද්ධති වර්ණ"</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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f066265..64fee5d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Zmeniť mriežku aplikácií"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Farby tapety"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikony, text a iné položky zodpovedajú farbami tapete"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Farba tapety"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Základné farby"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Ďalšie farby"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Vyberte farbu pre ikonu, hodiny a iné"</string>
<string name="color_changed" msgid="7029571720331641235">"Farba bola zmenená"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dynamické"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Farby systému"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Skratka vľavo"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Skratka vpravo"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Žiadne"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 07962d0..22dff29 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Ändra rutnät för appar"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Bakgrundsfärger"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoner, text med mera matchar bakgrundens färger"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Bakgrundsfärg"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Standardfärger"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Andra färger"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Använd valfri färg för ikoner, klockan med mera"</string>
<string name="color_changed" msgid="7029571720331641235">"Färgen har ändrats"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dynamisk"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Systemfärger"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Vänster genväg"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Höger genväg"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Inga"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index e8b7f76..4ebb83d 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"பீட்டா"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ஆப்ஸ் கட்டக் காட்சியை மாற்றும்"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"வால்பேப்பர் நிறங்கள்"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"வால்பேப்பருடன் பொருந்தும் ஐகான், உரை & பலவற்றின் வண்ணம்"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"வால்பேப்பரின் நிறம்"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"அடிப்படை வண்ணங்கள்"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"பிற வண்ணங்கள்"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"ஐகான்கள், கடிகாரம் & பலவற்றுக்கான வண்ணங்களை தேர்வுசெய்க"</string>
<string name="color_changed" msgid="7029571720331641235">"வண்ணம் மாற்றப்பட்டது"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"டைனமிக்"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"சிஸ்டம் வண்ணங்கள்"</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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 69f2784..d5c66ab 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Uygulama ızgarasını değiştirin"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Duvar kağıdı renkleri"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Simge, metin ve diğerleri için duvar kağıdınızla eşleşen renkler"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Duvar kağıdı rengi"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Temel renkler"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Diğer renkler"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Simge, saat ve diğerleri için istediğiniz rengi seçin"</string>
<string name="color_changed" msgid="7029571720331641235">"Renk değişti"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Dinamik"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Sistem renkleri"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Sol kısayol"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Sağ kısayol"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Yok"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f80282a..2e21975 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Бета"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Змінити сітку додатків"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Кольори фону"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Значки, текст тощо під кольори фонового малюнка"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Колір фонового малюнка"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Основні кольори"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Інші кольори"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Виберіть будь-який колір для значків, годинника тощо"</string>
<string name="color_changed" msgid="7029571720331641235">"Колір змінено"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Динамічний"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Кольори системи"</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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 63428af..d947df1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta 版"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"更改应用网格"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"壁纸颜色"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"图标、文字等项目的颜色会与您壁纸中的颜色相配"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"壁纸颜色"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"基本颜色"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"其他颜色"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"为您的图标、时钟等项目选择任意颜色"</string>
<string name="color_changed" msgid="7029571720331641235">"颜色已更改"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"动态"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"系统颜色"</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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 41a3109..34ee121 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta 版本"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"變更應用程式網格"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"桌布顏色"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"圖示、文字等與桌布顏色相配"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"桌布顏色"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"基本顏色"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"其他顏色"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"為圖示、時鐘等選擇任何顏色"</string>
<string name="color_changed" msgid="7029571720331641235">"已經變咗顏色"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"動態"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"系統顏色"</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a1da28f..94851e3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"Beta 版"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"變更應用程式格線"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"桌布顏色"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"為圖示、文字和其他項目選擇與桌布相襯的顏色"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"桌布顏色"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"基本顏色"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"其他配色"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"為圖示、時鐘和其他項目選擇任何想要的顏色"</string>
<string name="color_changed" msgid="7029571720331641235">"顏色已變更"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"動態"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"系統配色"</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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2bfe757..bf3ad3d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -105,18 +105,14 @@
<string name="beta_title" msgid="8703819523760746458">"I-beta"</string>
<string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Shintsha igridi ye-app"</string>
<string name="wallpaper_color_tab" msgid="1447926591721403840">"Imibala yesithombe sangemuva"</string>
- <!-- no translation found for wallpaper_color_subheader (4044464573669965670) -->
- <skip />
+ <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Izithonjana, umbhalo, neminye imibala efana nesithombe sakho sangemuva"</string>
<string name="wallpaper_color_title" msgid="5687965239180986458">"Umbala wesithombe sangemuva"</string>
<string name="preset_color_tab" msgid="3133391839341329314">"Imibala eyisisekelo"</string>
- <!-- no translation found for preset_color_tab_2 (1444107326712562538) -->
- <skip />
- <!-- no translation found for preset_color_subheader (8230588536141279371) -->
- <skip />
+ <string name="preset_color_tab_2" msgid="1444107326712562538">"Eminye imibala"</string>
+ <string name="preset_color_subheader" msgid="8230588536141279371">"Khetha umbala wezithonjana zakho, iwashi, nokuningi"</string>
<string name="color_changed" msgid="7029571720331641235">"Umbala ushintshiwe"</string>
<string name="adaptive_color_title" msgid="1336508599235896205">"Okuguqukayo"</string>
- <!-- no translation found for color_picker_title (6666830057938082864) -->
- <skip />
+ <string name="color_picker_title" msgid="6666830057938082864">"Imibala yesistimu"</string>
<string name="keyguard_slot_name_bottom_start" msgid="8747677880200629719">"Isinqamuleli sangakwesokunxele"</string>
<string name="keyguard_slot_name_bottom_end" msgid="2525487375680217083">"Isinqamuleli sangakwesokudla"</string>
<string name="keyguard_affordance_none" msgid="1751643933430782312">"Lutho"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0d5a9a8..cb4876a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -164,4 +164,12 @@
<dimen name="clock_carousel_scale" format="float">0.5</dimen>
<!-- Alpha of the carousel items that are not selected and at the side -->
<dimen name="clock_carousel_alpha" format="float">0.4</dimen>
+
+ <!-- Clock color and size button -->
+ <dimen name="clock_color_size_button_min_height">32dp</dimen>
+ <dimen name="clock_color_size_button_horizontal_padding">12dp</dimen>
+ <dimen name="clock_color_size_button_vertical_padding">6dp</dimen>
+ <dimen name="clock_color_size_button_corner_radius">16dp</dimen>
+ <dimen name="clock_color_size_button_icon_size">24dp</dimen>
+ <dimen name="clock_color_size_button_icon_margin_end">8dp</dimen>
</resources>
diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java
index 3c1d31d..786db54 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -115,6 +115,7 @@
mClockCarouselViewModel,
mClockViewFactory,
wallpaperPreviewNavigator,
+ sectionNavigationController,
wallpaperInteractor)
: new ScreenPreviewSectionController(
activity,
diff --git a/src/com/android/customization/picker/WallpaperPreviewer.java b/src/com/android/customization/picker/WallpaperPreviewer.java
index 354eec2..ef16895 100644
--- a/src/com/android/customization/picker/WallpaperPreviewer.java
+++ b/src/com/android/customization/picker/WallpaperPreviewer.java
@@ -38,6 +38,7 @@
import com.android.wallpaper.util.ResourceUtils;
import com.android.wallpaper.util.ScreenSizeCalculator;
import com.android.wallpaper.util.SizeCalculator;
+import com.android.wallpaper.util.VideoWallpaperUtils;
import com.android.wallpaper.util.WallpaperConnection;
import com.android.wallpaper.util.WallpaperConnection.WallpaperConnectionListener;
import com.android.wallpaper.util.WallpaperSurfaceCallback;
@@ -53,6 +54,7 @@
private final Activity mActivity;
private final ImageView mHomePreview;
private final SurfaceView mWallpaperSurface;
+ @Nullable private final View mFadeInScrim;
private WallpaperSurfaceCallback mWallpaperSurfaceCallback;
private WallpaperInfo mWallpaper;
@@ -67,11 +69,17 @@
public WallpaperPreviewer(Lifecycle lifecycle, Activity activity, ImageView homePreview,
SurfaceView wallpaperSurface) {
+ this(lifecycle, activity, homePreview, wallpaperSurface, null);
+ }
+
+ public WallpaperPreviewer(Lifecycle lifecycle, Activity activity, ImageView homePreview,
+ SurfaceView wallpaperSurface, @Nullable View fadeInScrim) {
lifecycle.addObserver(this);
mActivity = activity;
mHomePreview = homePreview;
mWallpaperSurface = wallpaperSurface;
+ mFadeInScrim = fadeInScrim;
mWallpaperSurfaceCallback = new WallpaperSurfaceCallback(activity, mHomePreview,
mWallpaperSurface, this::setUpWallpaperPreview);
mWallpaperSurface.setZOrderMediaOverlay(true);
@@ -139,6 +147,11 @@
@Nullable WallpaperColorsListener listener) {
mWallpaper = wallpaperInfo;
mWallpaperColorsListener = listener;
+ if (mFadeInScrim != null && VideoWallpaperUtils.needsFadeIn(wallpaperInfo)) {
+ mFadeInScrim.animate().cancel();
+ mFadeInScrim.setAlpha(1f);
+ mFadeInScrim.setVisibility(View.VISIBLE);
+ }
setUpWallpaperPreview();
}
@@ -209,6 +222,17 @@
mWallpaperColorsListener.onWallpaperColorsChanged(colors);
}
}
+
+ @Override
+ public void onEngineShown() {
+ if (mFadeInScrim != null && VideoWallpaperUtils.needsFadeIn(
+ homeWallpaper)) {
+ mFadeInScrim.animate().alpha(0.0f)
+ .setDuration(VideoWallpaperUtils.TRANSITION_MILLIS)
+ .withEndAction(
+ () -> mFadeInScrim.setVisibility(View.INVISIBLE));
+ }
+ }
}, mWallpaperSurface);
mWallpaperConnection.setVisibility(true);
diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
index def3778..cf80dc1 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
@@ -57,8 +57,11 @@
viewModel.allClockIds.collect { allClockIds ->
carouselView.setUpClockCarouselView(
clockIds = allClockIds,
- onGetClockPreview = { clockId -> clockViewFactory.getView(clockId) },
+ onGetClockController = { clockId ->
+ clockViewFactory.getController(clockId)
+ },
onClockSelected = { clockId -> viewModel.setSelectedClock(clockId) },
+ getPreviewRatio = { clockViewFactory.getRatio() }
)
}
}
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 90d7c42..3eae7aa 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
@@ -22,7 +22,9 @@
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.constraintlayout.helper.widget.Carousel
+import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.core.view.get
+import com.android.systemui.plugins.ClockController
import com.android.wallpaper.R
class ClockCarouselView(
@@ -35,21 +37,66 @@
) {
private val carousel: Carousel
+ private val motionLayout: MotionLayout
private lateinit var adapter: ClockCarouselAdapter
+ private lateinit var scalingUpClock: ClockController
+ private lateinit var scalingDownClock: ClockController
init {
- val view = LayoutInflater.from(context).inflate(R.layout.clock_carousel, this)
- carousel = view.requireViewById(R.id.carousel)
+ val clockCarousel = LayoutInflater.from(context).inflate(R.layout.clock_carousel, this)
+ carousel = clockCarousel.requireViewById(R.id.carousel)
+ motionLayout = clockCarousel.requireViewById(R.id.motion_container)
}
fun setUpClockCarouselView(
clockIds: List<String>,
- onGetClockPreview: (clockId: String) -> View,
+ onGetClockController: (clockId: String) -> ClockController,
onClockSelected: (clockId: String) -> Unit,
+ getPreviewRatio: () -> Float,
) {
- adapter = ClockCarouselAdapter(clockIds, onGetClockPreview, onClockSelected)
+ adapter =
+ ClockCarouselAdapter(clockIds, onGetClockController, onClockSelected, getPreviewRatio)
carousel.setAdapter(adapter)
carousel.refresh()
+ motionLayout.setTransitionListener(
+ object : MotionLayout.TransitionListener {
+ override fun onTransitionStarted(
+ motionLayout: MotionLayout?,
+ startId: Int,
+ endId: Int
+ ) {
+ val scalingDownClockId = adapter.clockIds[carousel.currentIndex]
+ val scalingUpIdx =
+ if (endId == R.id.next) (carousel.currentIndex + 1) % adapter.count()
+ else (carousel.currentIndex - 1 + adapter.count()) % adapter.count()
+ val scalingUpClockId = adapter.clockIds[scalingUpIdx]
+ scalingDownClock = adapter.onGetClockController(scalingDownClockId)
+ scalingUpClock = adapter.onGetClockController(scalingUpClockId)
+ }
+
+ override fun onTransitionChange(
+ motionLayout: MotionLayout?,
+ startId: Int,
+ endId: Int,
+ progress: Float
+ ) {
+ scalingDownClock.animations.onPickerCarouselSwiping(
+ 1 - progress,
+ getPreviewRatio()
+ )
+ scalingUpClock.animations.onPickerCarouselSwiping(progress, getPreviewRatio())
+ }
+
+ override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) {}
+
+ override fun onTransitionTrigger(
+ motionLayout: MotionLayout?,
+ triggerId: Int,
+ positive: Boolean,
+ progress: Float
+ ) {}
+ }
+ )
}
fun setSelectedClockIndex(
@@ -60,8 +107,9 @@
class ClockCarouselAdapter(
val clockIds: List<String>,
- val onGetClockPreview: (clockId: String) -> View,
- val onClockSelected: (clockId: String) -> Unit,
+ val onGetClockController: (clockId: String) -> ClockController,
+ private val onClockSelected: (clockId: String) -> Unit,
+ val getPreviewRatio: () -> Float,
) : Carousel.Adapter {
override fun count(): Int {
@@ -72,15 +120,29 @@
val viewRoot = view as ViewGroup
val clockHostView = viewRoot[0] as ViewGroup
clockHostView.removeAllViews()
- val clockView = onGetClockPreview(clockIds[index])
+ val clockView = onGetClockController(clockIds[index]).largeClock.view
// The clock view might still be attached to an existing parent. Detach before adding to
// another parent.
(clockView.parent as? ViewGroup)?.removeView(clockView)
clockHostView.addView(clockView)
+ // initialize scaling state for all clocks
+ if (view.id != MIDDLE_VIEW_IN_START_STATE) {
+ onGetClockController(clockIds[index])
+ .animations
+ .onPickerCarouselSwiping(0F, getPreviewRatio())
+ } else {
+ onGetClockController(clockIds[index])
+ .animations
+ .onPickerCarouselSwiping(1F, getPreviewRatio())
+ }
}
override fun onNewItem(index: Int) {
onClockSelected.invoke(clockIds[index])
}
}
+
+ companion object {
+ const val MIDDLE_VIEW_IN_START_STATE = R.id.item_view_2
+ }
}
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 3222c87..67c7002 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
@@ -33,9 +33,20 @@
) {
private val timeTickListeners: ConcurrentHashMap<Int, TimeTicker> = ConcurrentHashMap()
private val clockControllers: HashMap<String, ClockController> = HashMap()
+ private var ticker: TimeTicker? = null
+ fun getRatio(): Float {
+ val screenSizeCalculator = ScreenSizeCalculator.getInstance()
+ val screenSize = screenSizeCalculator.getScreenSize(activity.windowManager.defaultDisplay)
+ return activity.resources.getDimensionPixelSize(R.dimen.screen_preview_height).toFloat() /
+ screenSize.y.toFloat()
+ }
+
+ fun getController(clockId: String): ClockController {
+ return clockControllers[clockId] ?: initClockController(clockId)
+ }
fun getView(clockId: String): View {
- return (clockControllers[clockId] ?: initClockController(clockId)).largeClock.view
+ return getController(clockId).largeClock.view
}
fun updateColorForAllClocks(@ColorInt seedColor: Int?) {
@@ -79,14 +90,9 @@
controller.largeClock.events.onRegionDarknessChanged(isRegionDark)
// Configure font size
- 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
+ getRatio()
)
clockControllers[clockId] = controller
return controller
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java
index b5ed7ee..4de1dab 100644
--- a/src/com/android/customization/picker/grid/GridFragment.java
+++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -158,7 +158,8 @@
SurfaceView wallpaperSurface = view.findViewById(R.id.wallpaper_preview_surface);
WallpaperPreviewer wallpaperPreviewer = new WallpaperPreviewer(getLifecycle(),
- getActivity(), view.findViewById(R.id.wallpaper_preview_image), wallpaperSurface);
+ getActivity(), view.findViewById(R.id.wallpaper_preview_image), wallpaperSurface,
+ view.findViewById(R.id.grid_fadein_scrim));
// Loads current Wallpaper.
CurrentWallpaperInfoFactory factory = InjectorProvider.getInjector()
.getCurrentWallpaperInfoFactory(getContext().getApplicationContext());
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 6dbc7ef..0303b41 100644
--- a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
+++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
@@ -19,15 +19,19 @@
import android.app.Activity
import android.content.Context
+import android.view.View
import android.view.ViewGroup
import android.view.ViewStub
+import androidx.core.view.isVisible
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import com.android.customization.picker.clock.ui.binder.ClockCarouselViewBinder
+import com.android.customization.picker.clock.ui.fragment.ClockSettingsFragment
import com.android.customization.picker.clock.ui.view.ClockCarouselView
import com.android.customization.picker.clock.ui.view.ClockViewFactory
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
import com.android.wallpaper.R
+import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController
import com.android.wallpaper.model.WallpaperColorsViewModel
import com.android.wallpaper.model.WallpaperPreviewNavigator
import com.android.wallpaper.module.CurrentWallpaperInfoFactory
@@ -49,6 +53,7 @@
private val clockCarouselViewModel: ClockCarouselViewModel,
private val clockViewFactory: ClockViewFactory,
wallpaperPreviewNavigator: WallpaperPreviewNavigator,
+ private val navigationController: CustomizationSectionNavigationController,
wallpaperInteractor: WallpaperInteractor,
) :
ScreenPreviewSectionController(
@@ -63,11 +68,21 @@
) {
private var clockCarouselBinding: ClockCarouselViewBinder.Binding? = null
+ private var clockColorAndSizeButton: View? = null
override val hideLockScreenClockPreview = true
override fun createView(context: Context): ScreenPreviewView {
val view = super.createView(context)
+
+ val clockColorAndSizeButtonStub: ViewStub =
+ view.requireViewById(R.id.clock_color_and_size_button)
+ clockColorAndSizeButtonStub.layoutResource = R.layout.clock_color_and_size_button
+ clockColorAndSizeButton = clockColorAndSizeButtonStub.inflate() as View
+ clockColorAndSizeButton?.setOnClickListener {
+ navigationController.navigateTo(ClockSettingsFragment())
+ }
+
val carouselViewStub: ViewStub = view.requireViewById(R.id.clock_carousel_view_stub)
carouselViewStub.layoutResource = R.layout.clock_carousel_view
val carouselView = carouselViewStub.inflate() as ClockCarouselView
@@ -94,6 +109,7 @@
override fun onScreenSwitched(isOnLockScreen: Boolean) {
super.onScreenSwitched(isOnLockScreen)
+ clockColorAndSizeButton?.isVisible = isOnLockScreen
if (isOnLockScreen) {
clockCarouselBinding?.show()
} else {