Merge "Adjust color options to be larger for larger display sizes" into udc-qpr-dev
diff --git a/res/layout/clock_size_radio_button_group.xml b/res/layout/clock_size_radio_button_group.xml
index 2aa78d2..56d0ab7 100644
--- a/res/layout/clock_size_radio_button_group.xml
+++ b/res/layout/clock_size_radio_button_group.xml
@@ -68,11 +68,21 @@
android:layout_marginEnd="8dp"
android:clickable="false" />
- <TextView
- style="@style/SectionTitleTextStyle"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/clock_size_small" />
+ android:orientation="vertical">
+ <TextView
+ style="@style/SectionTitleTextStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/clock_size_small" />
+
+ <TextView
+ style="@style/SectionSubtitleTextStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/clock_size_small_description" />
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/color_section_view.xml b/res/layout/color_section_view.xml
deleted file mode 100644
index 6095c9b..0000000
--- a/res/layout/color_section_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2022 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.
--->
-<com.android.customization.picker.color.ColorSectionView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="@dimen/section_bottom_padding"
- android:orientation="vertical">
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingHorizontal="@dimen/separated_tabs_horizontal_padding">
- <include layout="@layout/separated_tabs" />
- </FrameLayout>
-
- <androidx.viewpager2.widget.ViewPager2
- android:id="@+id/color_section_view_pager"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/color_options_container_top_margin"
- android:clipChildren="false"
- android:clipToPadding="false"/>
-</com.android.customization.picker.color.ColorSectionView>
diff --git a/res/layout/single_clock_view.xml b/res/layout/single_clock_view.xml
deleted file mode 100644
index ffc6039..0000000
--- a/res/layout/single_clock_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-<com.android.wallpaper.picker.FixedWidthDisplayRatioFrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="@dimen/screen_preview_width"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:clipChildren="false">
- <com.android.customization.picker.clock.ui.view.ClockHostView
- android:id="@+id/single_clock_host_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center" />
-</com.android.wallpaper.picker.FixedWidthDisplayRatioFrameLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ed347ce..972e0b3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Horlosiegrootte verander na gelang van sluitskerminhoud"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Groot"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Klein"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Approoster"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Pas toe"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tik om te wysig"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index aaeb97b..0c17a95 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"የClock መጠን በማያ ገፅ ቁልፍ ይዘት መሰረት ይለወጣል"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ትልቅ"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ትንሽ"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"የመተግበሪያ ፍርግርግ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ተግብር"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ለማርትዕ መታ ያድርጉ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5172478..94ad8c8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"يتغير حجم الساعة وفقًا للمحتوى على شاشة القفل."</string>
<string name="clock_size_large" msgid="3143248715744138979">"كبير"</string>
<string name="clock_size_small" msgid="2280449912094164133">"صغير"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"شبكة التطبيقات"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"تطبيق"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"انقُر للتعديل."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 08d5acc..556ef6f 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"বন্ধ স্ক্ৰীনৰ সমল অনুসৰি ঘড়ীৰ আকাৰ সলনি হয়"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ডাঙৰ"</string>
<string name="clock_size_small" msgid="2280449912094164133">"সৰু"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"এপৰ গ্ৰিড"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"প্ৰয়োগ কৰক"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"সম্পাদনা কৰিবলৈ টিপক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index bd8df9b..baafb40 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Saat ölçüsü kilid ekranının məzmununa görə dəyişir"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Böyük"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Kiçik"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Tətbiq toru"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tətbiq edin"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Redaktə etmək üçün klikləyin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 50f6f68..185b773 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Veličina sata se menja u skladu sa sadržajem zaključanog ekrana"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Veliko"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Mali"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Mreža apl."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da biste izmenili"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d850932..bcd3ef2 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Памер гадзінніка змяняецца ў залежнасці ад змесціва на экране блакіроўкі"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Вялікі"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Дробны"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Сетка праграм"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ужыць"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Дакраніцеся, каб рэдагаваць"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 61e64a5..11697c4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Размерът на часовника се променя според съдържанието на заключения екран"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Голям"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Малък"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Решетка с прил."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Прилагане"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Докоснете, за да редактирате"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 34d8fe2..0367d11 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"লক স্ক্রিনের কন্টেন্ট অনুযায়ী ঘড়ির সাইজ পরিবর্তন হয়"</string>
<string name="clock_size_large" msgid="3143248715744138979">"বড়"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ছোট করুন"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"অ্যাপ গ্রিড"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"প্রয়োগ করুন"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"এডিট করতে ট্যাপ করুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a6b11b1..8e64889 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Veličina sata se mijenja u skladu sa sadržajem na zaključanom ekranu"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Veliko"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Malo"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Mreža aplikacija"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primijeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da uredite"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 811c09c..7325128 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"La mida del rellotge canvia d\'acord amb el contingut de la pantalla de bloqueig"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Gran"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Petit"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Quadrícula d\'apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplica"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca per editar"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 64ee6d4..1627e1c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Velikost hodin se mění podle obsahu obrazovky uzamčení"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Velká"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Malé"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Mřížka aplikací"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Použít"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Klepnutím upravte"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a1d7689..a3bce36 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Størrelsen på uret ændrer sig baseret på indhold på låseskærmen"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Stor"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Lille"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Appgitter"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Anvend"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tryk for at redigere"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bfc654c..894a62e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Die Größe der Uhr ändert sich je nach Inhalt auf dem Sperrbildschirm"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Groß"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Klein"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"App-Raster"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Anwenden"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Zum Bearbeiten tippen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index daa699c..5f9ef3e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Το μέγεθος του ρολογιού αλλάζει ανάλογα με το περιεχόμενο της οθόνης κλειδώματος"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Μεγάλο"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Μικρό"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Πλέγμα εφαρμ."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Εφαρμογή"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Πατήστε για επεξεργασία"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6fcf09f..7f7efed 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Clock size changes according to lock screen content"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Large"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Small"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 08b2eb1..e631c82 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -41,6 +41,7 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Clock size changes according to lock screen content"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Large"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Small"</string>
+ <string name="clock_size_small_description" msgid="4089511196955732480">"A small clock shows in the corner of your screen"</string>
<string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6fcf09f..7f7efed 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Clock size changes according to lock screen content"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Large"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Small"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6fcf09f..7f7efed 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Clock size changes according to lock screen content"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Large"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Small"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 121a30d..2fbe257 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -41,6 +41,7 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Clock size changes according to lock screen content"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Large"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Small"</string>
+ <string name="clock_size_small_description" msgid="4089511196955732480">"A small clock shows in the corner of your screen"</string>
<string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fa442b1..ffec8dd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"El tamaño del reloj cambia según el contenido de la pantalla de bloqueo"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Pequeño"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Cuadr. de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Presiona para editar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1ecfabd..712f8af 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"El tamaño del reloj cambia en función del contenido de la pantalla de bloqueo"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Pequeño"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Cuadrícula de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca para editar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 090f505..09223a3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Kella suurus muutub olenevalt lukustuskuva sisust"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Suur"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Väike"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Rak. ruudustik"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Rakenda"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Puudutage muutmiseks"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fe0ff56..021e7a0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Erlojuaren tamaina pantaila blokeatuko edukiaren arabera aldatzen da"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Handia"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Txikia"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Aplikazioen sareta"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplikatu"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Sakatu editatzeko"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4ea2dd5..38e3d74 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"اندازه ساعت نسبت به محتوای صفحه قفل تغییر میکند"</string>
<string name="clock_size_large" msgid="3143248715744138979">"بزرگ"</string>
<string name="clock_size_small" msgid="2280449912094164133">"کوچک"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"شبکه برنامهها"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"اعمال"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"برای ویرایش ضربه بزنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 13cae96..00df797 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Kellon koko riippuu lukitusnäytön sisällöstä"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Suuri"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Pieni"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Ruudukko"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Käytä"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Muokkaa napauttamalla"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ce29055..756e05d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"La taille de l\'horloge varie en fonction du contenu de l\'écran de verrouillage"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Petite"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grille d\'applis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Appliquer"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toucher pour modifier"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e35ac9d..c1010fc 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"La taille de l\'horloge change selon le contenu de l\'écran de verrouillage"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Petite"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grille d\'applis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Appliquer"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Appuyer pour modifier"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 64b85f8..cfe5d5b 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"O tamaño do reloxo cambia en función do contido da pantalla de bloqueo"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Pequeno"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grade de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca para editar"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index e3c8a91..f1b643b 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ઘડિયાળનું કદ લૉક સ્ક્રીન પરના કન્ટેન્ટ અનુસાર બદલાય છે"</string>
<string name="clock_size_large" msgid="3143248715744138979">"મોટું"</string>
<string name="clock_size_small" msgid="2280449912094164133">"નાનું"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ઍપ ગ્રિડ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"લાગુ કરો"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ફેરફાર કરવા માટે ટૅપ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6cd69b0..71387d9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"लॉक स्क्रीन के कॉन्टेंट के हिसाब से घड़ी का साइज़ बदलता है"</string>
<string name="clock_size_large" msgid="3143248715744138979">"बड़ा"</string>
<string name="clock_size_small" msgid="2280449912094164133">"छोटा"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ऐप्लिकेशन ग्रिड"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"लागू करें"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"बदलाव करने के लिए टैप करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ff3d127..c0f7616 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Veličina sata mijenja se u skladu sa sadržajem zaključanog zaslona"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Velik"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Mali"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Rešetka aplik."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primijeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da biste uredili"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e9767e5..1800929 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Az óra mérete a lezárási képernyő tartalmától függően változik."</string>
<string name="clock_size_large" msgid="3143248715744138979">"Nagy"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Kicsi"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Alkalmazásrács"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Alkalmaz"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Koppintson a szerkesztéshez"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7cfed42..11cc44e 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Ժամացույցի չափսը փոխվում է կողպէկրանի բովանդակությանը համապատասխան"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Մեծ"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Փոքր"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Հավելվածների ցանց"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Կիրառել"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Հպեք՝ փոփոխելու համար"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4d41c12..635e88c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Ukuran jam berubah sesuai dengan konten layar kunci"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Besar"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Kecil"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Petak aplikasi"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Terapkan"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketuk untuk mengedit"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 75270b7..396ee13 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Stærð klukku breytist í samræmi við efni á lásskjá"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Stór"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Lítil"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Forritatafla"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Nota"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ýttu til að breyta"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5a1697e..2dbd384 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Le dimensioni dell\'orologio cambiano in base ai contenuti della schermata di blocco"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grandi"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Piccole"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Griglia di app"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Applica"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tocca per modificare"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a1da594..0c5c211 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"גודל השעון משתנה בהתאם לתוכן במסך הנעילה"</string>
<string name="clock_size_large" msgid="3143248715744138979">"גדול"</string>
<string name="clock_size_small" msgid="2280449912094164133">"קטן"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"תצוגת האפליקציות"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"אישור"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"יש להקיש כדי לערוך"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 07ec012..ee04dcf 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"時計のサイズがロック画面の状況に応じて変わります"</string>
<string name="clock_size_large" msgid="3143248715744138979">"大"</string>
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"アプリグリッド"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"適用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"タップして編集"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index cbcacc7..9e70898 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"საათის ზომა იცვლება დაბლოკილი ეკრანის შინაარსის მიხედვით"</string>
<string name="clock_size_large" msgid="3143248715744138979">"დიდი"</string>
<string name="clock_size_small" msgid="2280449912094164133">"პატარა"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"აპების ბადე"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"მისადაგება"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"შეეხეთ რედაქტირებისთვის"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c54efd6..5c0bc4f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Сағаттың өлшемі құлып экранындағы контентке сай өзгереді."</string>
<string name="clock_size_large" msgid="3143248715744138979">"Үлкен"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Кішi"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Қолданба торы"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Қолдану"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Өзгерту үшін түртіңіз"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 90be955..e7abee3 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ទំហំនាឡិកាផ្លាស់ប្ដូរទៅតាមខ្លឹមសារលើអេក្រង់ចាក់សោ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ធំ"</string>
<string name="clock_size_small" msgid="2280449912094164133">"តូច"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ក្រឡាកម្មវិធី"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ប្រើ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ចុច ដើម្បីកែ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 74f8d1a..889ec61 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿರುವ ವಿಷಯಕ್ಕೆ ಅನುಗುಣವಾಗಿ ಗಡಿಯಾರದ ಗಾತ್ರ ಬದಲಾಗುತ್ತದೆ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ದೊಡ್ಡದು"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ಚಿಕ್ಕದು"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ಆ್ಯಪ್ ಗ್ರಿಡ್"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ಅನ್ವಯಿಸಿ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ಎಡಿಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 12366d6..ae5255a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"시계 크기가 잠금 화면 콘텐츠에 따라 변경됩니다."</string>
<string name="clock_size_large" msgid="3143248715744138979">"크게"</string>
<string name="clock_size_small" msgid="2280449912094164133">"작게"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"앱 그리드"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"적용"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"탭하여 수정"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 5bbe18d..deba46b 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Сааттын өлчөмү кулпуланган экрандагы нерселерге ылайык өзгөрөт"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Чоң"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Кичине"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Колдонмонун торчосу"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Колдонуу"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Өзгөртүү үчүн таптап коюңуз"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index dcfe6f7..5d68fad 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ຂະໜາດຂອງໂມງປ່ຽນຕາມເນື້ອຫາໃນໜ້າຈໍລັອກ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ໃຫຍ່"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ນ້ອຍ"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ຕາຕະລາງແອັບ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ນຳໃຊ້"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ແຕະເພື່ອແກ້ໄຂ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d36be73..fbb7936 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Laikrodžio dydis keičiamas pagal užrakinimo ekrano turinį"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Didelis"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Mažas"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Pr. tinklelis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Taikyti"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Palieskite ir redaguokite"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0ef9afe..274f87e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Pulksteņa lielums mainās atkarībā no bloķēšanas ekrāna satura."</string>
<string name="clock_size_large" msgid="3143248715744138979">"Liels"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Mazs"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Lietotņu režģis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Lietot"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Pieskarieties, lai rediģētu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 0761664..eae161f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Големината на часовникот се променува според содржините на заклучен екран"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Голема"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Мала"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Мрежа"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Примени"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Допрете за да измените"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0360316..13da633 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ലോക്ക് സ്ക്രീൻ ഉള്ളടക്കത്തിനനുസരിച്ച് ക്ലോക്കിന്റെ വലുപ്പം മാറുന്നു"</string>
<string name="clock_size_large" msgid="3143248715744138979">"വലുത്"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ചെറുത്"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ആപ്പ് ഗ്രിഡ്"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"പ്രയോഗിക്കുക"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"എഡിറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index aa647ae..953b3ee 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Цагны хэмжээ нь түгжээтэй дэлгэцийн контентоос хамаарч өөрчлөгддөг"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Том"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Жижиг"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Аппын хүснэгт"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ашиглах"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Засахын тулд товшино уу"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b5152bf..b92e867 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"लॉक स्क्रीनवरील आशयानुसार घड्याळाचा आकार बदलेल"</string>
<string name="clock_size_large" msgid="3143248715744138979">"मोठा"</string>
<string name="clock_size_small" msgid="2280449912094164133">"छोटे"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ॲप ग्रिड"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"लागू करा"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"संपादित करण्यासाठी टॅप करा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c1be28d..bb207f4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Saiz jam berubah mengikut kandungan skrin kunci"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Besar"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Kecil"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grid apl"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Gunakan"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketik untuk edit"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 4465950..656b976 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"လော့ခ်မျက်နှာပြင် အကြောင်းအရာအလိုက် နာရီအရွယ်အစား ပြောင်းလဲသည်"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ကြီး"</string>
<string name="clock_size_small" msgid="2280449912094164133">"သေး"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"အက်ပ်ဇယား"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"အသုံးပြုရန်"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"တည်းဖြတ်ရန် တို့ပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4757db3..32c597d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Klokkens størrelse endres basert på innholdet på låseskjermen"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Stor"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Liten"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Apprutenett"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Bruk"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Trykk for å endre"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 571f1ac..1cc1fc6 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"घडीको आकार लक स्क्रिनको सामग्रीका आधारमा परिवर्तन हुन्छ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ठुलो"</string>
<string name="clock_size_small" msgid="2280449912094164133">"सानो"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"एप ग्रिड"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"लागू गर्नुहोस्"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"सम्पादन गर्न ट्याप गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3b4d1f8..f474b22 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Het formaat van de klok past zich aan de content van het vergrendelscherm aan"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Groot"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Klein"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"App-raster"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Toepassen"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tik om te bewerken"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index de5ddb8..46fbbae 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ଘଣ୍ଟାର ଆକାର ଲକ ସ୍କ୍ରିନର ବିଷୟବସ୍ତୁ ଅନୁସାରେ ପରିବର୍ତ୍ତନ ହୋଇଥାଏ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ବଡ଼"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ଛୋଟ"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ଆପ ଗ୍ରିଡ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ପ୍ରୟୋଗ କରନ୍ତୁ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ଏଡିଟ କରିବା ପାଇଁ ଟାପ କରନ୍ତୁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2a3e2e4..9ba41b5 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ਘੜੀ ਦਾ ਆਕਾਰ ਲਾਕ ਸਕ੍ਰੀਨ ਦੀ ਸਮੱਗਰੀ ਮੁਤਾਬਕ ਬਦਲਦਾ ਹੈ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ਵੱਡਾ"</string>
<string name="clock_size_small" msgid="2280449912094164133">"ਛੋਟਾ"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ਐਪ ਗ੍ਰਿਡ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ਲਾਗੂ ਕਰੋ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ਸੰਪਾਦਨ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 07ac8f0..280554e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Rozmiar zegara zmienia się w zależności od zawartości ekranu blokady"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Duży"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Mały"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Siatka aplikacji"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Zastosuj"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Kliknij, by edytować"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ce75c0d..fce1d95 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"O tamanho do relógio muda de acordo com o conteúdo do ecrã de bloqueio"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Pequeno"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grelha de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toque para editar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8164779..40313a3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"O tamanho do relógio muda de acordo com o conteúdo na tela de bloqueio"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Grande"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Pequeno"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grade de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toque para editar"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f29126e..bcb1f5a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Dimensiunea ceasului se schimbă în funcție de conținutul ecranului de blocare"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Mare"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Mică"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grilă aplicații"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplică"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Atinge pentru a modifica"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ca29dc7..0b447c5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Размер часов меняется в зависимости от контента на заблокированном экране"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Большой"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Маленький"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Сетка приложений"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Применить"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Нажмите, чтобы изменить"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index dc06efc..0637460 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"අගුළු තිරයේ අන්තර්ගතය අනුව ඔරලෝසුවේ තරම වෙනස් වේ"</string>
<string name="clock_size_large" msgid="3143248715744138979">"විශාල"</string>
<string name="clock_size_small" msgid="2280449912094164133">"කුඩා"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"යෙදුම් ජාලකය"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"යොදන්න"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"සංස්කරණයට තට්ටු කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 895bd33..f32614f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Veľkosť hodín sa mení podľa obsahu na uzamknutej obrazovke"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Veľké"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Malé"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Mriežka aplik."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Použiť"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Klepnutím upravte"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c236e82..f473dd8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Velikost ure se spremeni glede na vsebino zaklenjenega zaslona."</string>
<string name="clock_size_large" msgid="3143248715744138979">"Velika"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Majhna"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Mreža aplikacij"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Uporabi"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dotaknite se za urejanje"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 97ebb97..e629728 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Madhësia e orës ndryshon sipas përmbajtjes së ekranit të kyçjes"</string>
<string name="clock_size_large" msgid="3143248715744138979">"E madhe"</string>
<string name="clock_size_small" msgid="2280449912094164133">"E vogël"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Rrjeta e aplikacioneve"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Zbato"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Trokit për të modifikuar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9840e28..f35a220 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Величина сата се мења у складу са садржајем закључаног екрана"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Велико"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Мали"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Мрежа апл."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Примени"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Додирните да бисте изменили"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c369b94..5d32cb5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Klockans storlek ändras utifrån innehållet på låsskärmen"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Stor"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Liten"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Apprutnät"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Använd"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tryck för att redigera"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d3d7f0b..84d31b7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Ukubwa wa saa hubadilika kulingana na maudhui yaliyo kwenye skrini iliyofungwa"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Kubwa"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Ndogo"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Gridi ya programu"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tumia"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Gusa ili ubadilishe"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index ce6b088..4c1c3f3 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"பூட்டுத் திரையில் உள்ள உள்ளடக்கத்தைப் பொறுத்து கடிகாரத்தின் அளவு மாறுபடும்"</string>
<string name="clock_size_large" msgid="3143248715744138979">"பெரியது"</string>
<string name="clock_size_small" msgid="2280449912094164133">"சிறியது"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ஆப்ஸ் கட்டம்"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"பயன்படுத்து"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"\'தீமைத்\' திருத்த தட்டவும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5999497..df00044 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"లాక్ స్క్రీన్ కంటెంట్ ప్రకారం గడియారం సైజ్ మారుతుంది"</string>
<string name="clock_size_large" msgid="3143248715744138979">"పెద్దది"</string>
<string name="clock_size_small" msgid="2280449912094164133">"చిన్నది"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"యాప్ గ్రిడ్"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"వర్తింపజేయి"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ఎడిట్ చేయడానికి నొక్కండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d0b2747..b0736ba 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"ขนาดของนาฬิกาจะเปลี่ยนตามเนื้อหาในหน้าจอล็อก"</string>
<string name="clock_size_large" msgid="3143248715744138979">"ใหญ่"</string>
<string name="clock_size_small" msgid="2280449912094164133">"เล็ก"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ตารางกริดแอป"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ใช้"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"แตะเพื่อแก้ไข"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index efef868..0fc8397 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Mga pagbabago sa laki ng orasan ayon sa content ng lock screen"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Malaki"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Maliit"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Grid ng app"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ilapat"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"I-tap para ma-edit"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 553439f..8d84be0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Saat boyutu, kilit ekranındaki içeriklere göre değişir"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Büyük"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Küçük"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Uygulama tablosu"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Uygula"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Düzenlemek için dokunun"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 71a25e2..8ddc459 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Розмір годинника змінюється відповідно до вмісту заблокованого екрана"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Великий"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Малий"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Сітка додатків"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Застосувати"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Торкніться, щоб змінити"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 0755faf..fb25b10 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"مقفل اسکرین کے مواد کے مطابق گھڑی کا سائز تبدیل ہوتا ہے"</string>
<string name="clock_size_large" msgid="3143248715744138979">"بڑا"</string>
<string name="clock_size_small" msgid="2280449912094164133">"چھوٹا"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"ایپ گرڈ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"لاگو کریں"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ترمیم کرنے کے لیے تھپتھپائيں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 903aeee..3700b9e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Soat hajmi ekran qulfidagi kontent asosida oʻzgaradi"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Yirik"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Kichik"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Ilovalar jadvali"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tatbiq etish"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tahrirlash uchun tegining"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7362c7a..a689f4a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Kích thước đồng hồ thay đổi theo nội dung trên màn hình khoá"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Lớn"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Nhỏ"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Lưới ứng dụng"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Áp dụng"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Nhấn để chỉnh sửa"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 36e5af5..3df63ec 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"时钟大小会依据锁定屏幕上的内容而变化"</string>
<string name="clock_size_large" msgid="3143248715744138979">"大"</string>
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"应用网格"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"应用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"点按即可修改"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index dfda112..946264f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"時鐘按上鎖畫面內容變更大小"</string>
<string name="clock_size_large" msgid="3143248715744138979">"大"</string>
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"應用程式網格"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"套用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"輕按即可編輯"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 27f1e32..0e7b05e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"時鐘大小會依螢幕鎖定畫面上的內容調整"</string>
<string name="clock_size_large" msgid="3143248715744138979">"大"</string>
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"應用程式格線"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"套用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"輕觸這裡即可編輯"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 25bc2fd..25c7cf3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -41,6 +41,8 @@
<string name="clock_size_dynamic_description" msgid="2776620745774561662">"Usayizi wewashi uyashintsha ngokuya ngokuqukethwe kokukhiya isikrini"</string>
<string name="clock_size_large" msgid="3143248715744138979">"Obukhulu"</string>
<string name="clock_size_small" msgid="2280449912094164133">"Esincane"</string>
+ <!-- no translation found for clock_size_small_description (4089511196955732480) -->
+ <skip />
<string name="grid_title" msgid="1688173478777254123">"Igridi ye-app"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Faka"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Thepha ukuze uhlele"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 680947d..eb68dce 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -90,6 +90,9 @@
<!-- Title of a radio button to apply clock size small. [CHAR LIMIT=15] -->
<string name="clock_size_small">Small</string>
+ <!-- Description of a radio button to apply clock size small. [CHAR LIMIT=NONE] -->
+ <string name="clock_size_small_description">A small clock shows in the corner of your screen</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>
diff --git a/src/com/android/customization/model/CustomizationManager.java b/src/com/android/customization/model/CustomizationManager.java
index 104cc83..e6d3872 100644
--- a/src/com/android/customization/model/CustomizationManager.java
+++ b/src/com/android/customization/model/CustomizationManager.java
@@ -72,6 +72,9 @@
*/
void apply(T option, Callback callback);
+ /** Preview the given option without committing the change. */
+ default void preview(T option) {}
+
/**
* Loads the available options for the type of Customization managed by this class, calling the
* given callback when done.
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index e545271..74a4051 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -432,7 +432,8 @@
val extractor = ColorBundlePreviewExtractor(mContext)
val bundles: MutableList<ColorOption> = ArrayList()
- val bundleNames = getItemsFromStub(COLOR_BUNDLES_ARRAY_NAME)
+ val bundleNames =
+ if (isAvailable) getItemsFromStub(COLOR_BUNDLES_ARRAY_NAME) else emptyArray()
// Color option index value starts from 1.
var index = 1
val maxPresetColors = if (themeStyleEnabled) bundleNames.size else MAX_PRESET_COLORS
diff --git a/src/com/android/customization/model/color/ColorSectionController.java b/src/com/android/customization/model/color/ColorSectionController.java
deleted file mode 100644
index be051ac..0000000
--- a/src/com/android/customization/model/color/ColorSectionController.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * Copyright (C) 2022 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.model.color;
-
-import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
-import static android.view.View.VISIBLE;
-
-import static com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_HOME;
-import static com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_LOCK;
-import static com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_PRESET;
-import static com.android.customization.widget.OptionSelectorController.CheckmarkStyle.CENTER;
-
-import android.app.Activity;
-import android.app.WallpaperColors;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.stats.style.StyleEnums;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.widget.FrameLayout;
-
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
-
-import com.android.customization.model.CustomizationManager;
-import com.android.customization.model.theme.OverlayManagerCompat;
-import com.android.customization.module.CustomizationInjector;
-import com.android.customization.module.ThemesUserEventLogger;
-import com.android.customization.picker.color.ColorSectionView;
-import com.android.customization.widget.OptionSelectorController;
-import com.android.wallpaper.R;
-import com.android.wallpaper.model.CustomizationSectionController;
-import com.android.wallpaper.model.WallpaperColorsViewModel;
-import com.android.wallpaper.module.InjectorProvider;
-import com.android.wallpaper.widget.PageIndicator;
-import com.android.wallpaper.widget.SeparatedTabLayout;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-
-/**
- * Color section view's controller for the logic of color customization.
- */
-public class ColorSectionController implements CustomizationSectionController<ColorSectionView> {
-
- private static final String TAG = "ColorSectionController";
- private static final String KEY_COLOR_TAB_POSITION = "COLOR_TAB_POSITION";
- private static final String KEY_COLOR_PAGE_POSITION = "COLOR_PAGE_POSITION";
- private static final String ID_VIEWPAGER = "ColorSectionController_colorSectionViewPager";
- private static final String ID_ITEMVIEW = "ColorSectionController_itemView";
- private static final String ID_CONTAINER = "ColorSectionController_container";
- private static final long MIN_COLOR_APPLY_PERIOD = 500L;
-
- private static final int WALLPAPER_TAB_INDEX = 0;
- private static final int PRESET_TAB_INDEX = 1;
-
- private final ThemesUserEventLogger mEventLogger;
- private final ColorCustomizationManager mColorManager;
- private final WallpaperColorsViewModel mWallpaperColorsViewModel;
- private final LifecycleOwner mLifecycleOwner;
- private final ColorSectionAdapter mColorSectionAdapter = new ColorSectionAdapter();
-
- private List<ColorOption> mWallpaperColorOptions = new ArrayList<>();
- private List<ColorOption> mPresetColorOptions = new ArrayList<>();
- private ViewPager2 mColorSectionViewPager;
- private ColorOption mSelectedColor;
- private SeparatedTabLayout mTabLayout;
- @Nullable private WallpaperColors mHomeWallpaperColors;
- @Nullable private WallpaperColors mLockWallpaperColors;
- // Uses a boolean value to indicate whether wallpaper color is ready because WallpaperColors
- // maybe be null when it's ready.
- private boolean mHomeWallpaperColorsReady;
- private boolean mLockWallpaperColorsReady;
- private Optional<Integer> mTabPositionToRestore = Optional.empty();
- private Optional<Integer>[] mPagePositionToRestore =
- new Optional[]{Optional.empty(), Optional.empty()};
- private long mLastColorApplyingTime = 0L;
- private ColorSectionView mColorSectionView;
-
- private static int getNumPages(int optionsPerPage, int totalOptions) {
- return (int) Math.ceil((float) totalOptions / optionsPerPage);
- }
-
- public ColorSectionController(Activity activity, WallpaperColorsViewModel viewModel,
- LifecycleOwner lifecycleOwner, @Nullable Bundle savedInstanceState) {
- CustomizationInjector injector = (CustomizationInjector) InjectorProvider.getInjector();
- mEventLogger = (ThemesUserEventLogger) injector.getUserEventLogger(activity);
- mColorManager = ColorCustomizationManager.getInstance(activity,
- new OverlayManagerCompat(activity));
- mWallpaperColorsViewModel = viewModel;
- mLifecycleOwner = lifecycleOwner;
-
- if (savedInstanceState != null) {
- if (savedInstanceState.containsKey(KEY_COLOR_TAB_POSITION)) {
- mTabPositionToRestore = Optional.of(
- savedInstanceState.getInt(KEY_COLOR_TAB_POSITION));
- }
-
- for (int i = 0; i < mPagePositionToRestore.length; i++) {
- String keyColorPage = getPagePositionKey(i);
- if (keyColorPage != null && savedInstanceState.containsKey(keyColorPage)) {
- setPagePositionToRestore(i, savedInstanceState.getInt(keyColorPage));
- }
- }
- }
- }
-
- private String getPagePositionKey(int index) {
- return String.format(Locale.US, "%s_%d", KEY_COLOR_PAGE_POSITION, index);
- }
-
- private void setPagePositionToRestore(int pagePositionKeyIndex, int pagePosition) {
- if (pagePositionKeyIndex >= 0 && pagePositionKeyIndex < mPagePositionToRestore.length) {
- mPagePositionToRestore[pagePositionKeyIndex] = Optional.of(pagePosition);
- }
- }
-
- private int getPagePositionToRestore(int pagePositionKeyIndex, int defaultPagePosition) {
- if (pagePositionKeyIndex >= 0 && pagePositionKeyIndex < mPagePositionToRestore.length) {
- return mPagePositionToRestore[pagePositionKeyIndex].orElse(defaultPagePosition);
- }
- return 0;
- }
-
- @Override
- public boolean isAvailable(@Nullable Context context) {
- return context != null && ColorUtils.isMonetEnabled(context) && mColorManager.isAvailable();
- }
-
- @Override
- public ColorSectionView createView(Context context) {
- mColorSectionView = (ColorSectionView) LayoutInflater.from(context).inflate(
- R.layout.color_section_view, /* root= */ null);
- mColorSectionViewPager = mColorSectionView.findViewById(R.id.color_section_view_pager);
- mColorSectionViewPager.setAccessibilityDelegate(createAccessibilityDelegate(ID_VIEWPAGER));
- mColorSectionViewPager.setAdapter(mColorSectionAdapter);
- mColorSectionViewPager.setUserInputEnabled(false);
- if (ColorProvider.themeStyleEnabled) {
- mColorSectionViewPager.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
- }
- mTabLayout = mColorSectionView.findViewById(R.id.separated_tabs);
- mColorSectionAdapter.setNumColors(context.getResources().getInteger(
- R.integer.options_grid_num_columns));
- // TODO(b/202145216): Use just 2 views when tapping either button on top.
- mTabLayout.setViewPager(mColorSectionViewPager);
-
- mWallpaperColorsViewModel.getHomeWallpaperColorsLiveData().observe(mLifecycleOwner,
- homeColors -> {
- mHomeWallpaperColors = homeColors;
- mHomeWallpaperColorsReady = true;
- maybeLoadColors();
- });
- mWallpaperColorsViewModel.getLockWallpaperColorsLiveData().observe(mLifecycleOwner,
- lockColors -> {
- mLockWallpaperColors = lockColors;
- mLockWallpaperColorsReady = true;
- maybeLoadColors();
- });
- return mColorSectionView;
- }
-
- @Override
- public void onSaveInstanceState(Bundle savedInstanceState) {
- if (mColorSectionViewPager != null) {
- savedInstanceState.putInt(KEY_COLOR_TAB_POSITION,
- mColorSectionViewPager.getCurrentItem());
-
- for (int i = 0; i < mPagePositionToRestore.length; i++) {
- savedInstanceState.putInt(getPagePositionKey(i), getPagePositionToRestore(i, 0));
- }
- }
- }
-
- private void maybeLoadColors() {
- if (mHomeWallpaperColorsReady && mLockWallpaperColorsReady) {
- mColorManager.setWallpaperColors(mHomeWallpaperColors, mLockWallpaperColors);
- loadColorOptions(/* reload= */ false);
- }
- }
-
- private void loadColorOptions(boolean reload) {
- mColorManager.fetchOptions(new CustomizationManager.OptionsFetchedListener<ColorOption>() {
- @Override
- public void onOptionsLoaded(List<ColorOption> options) {
- List<ColorOption> wallpaperColorOptions = new ArrayList<>();
- List<ColorOption> presetColorOptions = new ArrayList<>();
- for (ColorOption option : options) {
- if (option instanceof ColorSeedOption) {
- wallpaperColorOptions.add(option);
- } else if (option instanceof ColorBundle) {
- presetColorOptions.add(option);
- }
- }
- mWallpaperColorOptions = wallpaperColorOptions;
- mPresetColorOptions = presetColorOptions;
- mSelectedColor = findActiveColorOption(mWallpaperColorOptions,
- mPresetColorOptions);
- mTabLayout.post(()-> setUpColorViewPager());
- }
-
- @Override
- public void onError(@Nullable Throwable throwable) {
- if (throwable != null) {
- Log.e(TAG, "Error loading theme bundles", throwable);
- }
- }
- }, reload);
- }
-
- private void setUpColorViewPager() {
- mColorSectionAdapter.notifyDataSetChanged();
-
- if (mTabLayout != null && mTabLayout.getTabCount() == 0) {
- mTabLayout.addTab(mTabLayout.newTab().setText(R.string.wallpaper_color_tab),
- WALLPAPER_TAB_INDEX);
- mTabLayout.addTab(mTabLayout.newTab().setText(R.string.preset_color_tab),
- PRESET_TAB_INDEX);
- }
-
- if (mWallpaperColorOptions.isEmpty()) {
- // Select preset tab and disable wallpaper tab.
- mTabLayout.getTabAt(WALLPAPER_TAB_INDEX).view.setEnabled(false);
- mColorSectionViewPager.setCurrentItem(PRESET_TAB_INDEX, /* smoothScroll= */ false);
- return;
- }
-
- mColorSectionViewPager.setCurrentItem(
- mTabPositionToRestore.orElseGet(
- () -> COLOR_SOURCE_PRESET.equals(mColorManager.getCurrentColorSource())
- ? PRESET_TAB_INDEX
- : WALLPAPER_TAB_INDEX),
- /* smoothScroll= */ false);
-
- // Disable "wallpaper colors" and "basic colors" swiping for new color style.
- mColorSectionViewPager.setUserInputEnabled(!ColorProvider.themeStyleEnabled);
- }
-
- private void setupColorPages(ViewPager2 container, int colorsPerPage, int sectionPosition,
- List<ColorOption> options, PageIndicator pageIndicator) {
- container.setAdapter(new ColorPageAdapter(options, /* pageEnabled= */ true,
- colorsPerPage));
- if (ColorProvider.themeStyleEnabled) {
- // Update page index to show selected items.
- int selectedIndex = options.indexOf(mSelectedColor);
- if (colorsPerPage != 0) {
- int pageIndex = selectedIndex / colorsPerPage;
- int position = getPagePositionToRestore(sectionPosition, pageIndex);
- container.setCurrentItem(position, /* smoothScroll= */ false);
- }
- pageIndicator.setNumPages(getNumPages(colorsPerPage, options.size()));
- registerOnPageChangeCallback(sectionPosition, container, pageIndicator);
- }
- }
-
- private void registerOnPageChangeCallback(int sectionPosition, ViewPager2 container,
- PageIndicator pageIndicator) {
- container.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
- @Override
- public void onPageSelected(int position) {
- super.onPageSelected(position);
- if (mColorSectionViewPager.getCurrentItem() == sectionPosition) {
- pageIndicator.setLocation(getPagePosition(pageIndicator, position));
- setPagePositionToRestore(sectionPosition, position);
- }
- }
-
- @Override
- public void onPageScrolled(int position, float positionOffset,
- int positionOffsetPixels) {
- super.onPageScrolled(position, positionOffset, positionOffsetPixels);
- if (mColorSectionViewPager.getCurrentItem() == sectionPosition) {
- pageIndicator.setLocation(getPagePosition(pageIndicator, position));
- setPagePositionToRestore(sectionPosition, position);
- }
- }
-
- private int getPagePosition(PageIndicator pageIndicator, int position) {
- return pageIndicator.isLayoutRtl() ? pageIndicator.getChildCount() - 1 - position
- : position;
- }
- });
- }
-
- private void setupColorOptions(RecyclerView container, List<ColorOption> colorOptions,
- boolean pageEnabled, int index, int colorsPerPage) {
- int totalSize = colorOptions.size();
- if (totalSize == 0) {
- return;
- }
-
- List<ColorOption> subOptions;
- if (pageEnabled && ColorProvider.themeStyleEnabled) {
- subOptions = colorOptions.subList(colorsPerPage * index,
- Math.min(colorsPerPage * (index + 1), totalSize));
- } else {
- subOptions = colorOptions;
- }
-
- OptionSelectorController<ColorOption> adaptiveController = new OptionSelectorController<>(
- container, subOptions, /* useGrid= */ true, CENTER);
- adaptiveController.initOptions(mColorManager);
- setUpColorOptionsController(adaptiveController);
- }
-
- private ColorOption findActiveColorOption(List<ColorOption> wallpaperColorOptions,
- List<ColorOption> presetColorOptions) {
- ColorOption activeColorOption = null;
- for (ColorOption colorOption : Lists.newArrayList(
- Iterables.concat(wallpaperColorOptions, presetColorOptions))) {
- if (colorOption.isActive(mColorManager)) {
- activeColorOption = colorOption;
- break;
- }
- }
- // Use the first one option by default. This should not happen as above should have an
- // active option found.
- if (activeColorOption == null) {
- activeColorOption = wallpaperColorOptions.isEmpty()
- ? presetColorOptions.get(0)
- : wallpaperColorOptions.get(0);
- }
- return activeColorOption;
- }
-
- private void setUpColorOptionsController(
- OptionSelectorController<ColorOption> optionSelectorController) {
- if (mSelectedColor != null && optionSelectorController.containsOption(mSelectedColor)) {
- optionSelectorController.setSelectedOption(mSelectedColor);
- }
-
- optionSelectorController.addListener(selectedOption -> {
- ColorOption selectedColor = (ColorOption) selectedOption;
- if (mSelectedColor.equals(selectedColor)) {
- return;
- }
- mSelectedColor = (ColorOption) selectedOption;
- // Post with delay for color option to run ripple.
- new Handler().postDelayed(()-> applyColor(mSelectedColor), /* delayMillis= */ 100);
- });
- }
-
- private void applyColor(ColorOption colorOption) {
- if (SystemClock.elapsedRealtime() - mLastColorApplyingTime < MIN_COLOR_APPLY_PERIOD) {
- return;
- }
- mLastColorApplyingTime = SystemClock.elapsedRealtime();
- mColorManager.apply(colorOption, new CustomizationManager.Callback() {
- @Override
- public void onSuccess() {
- mColorSectionView.announceForAccessibility(
- mColorSectionView.getContext().getString(R.string.color_changed));
- mEventLogger.logColorApplied(getColorAction(colorOption), colorOption);
- }
-
- @Override
- public void onError(@Nullable Throwable throwable) {
- Log.w(TAG, "Apply theme with error: " + throwable);
- }
- });
- }
-
- private int getColorAction(ColorOption colorOption) {
- int action = StyleEnums.DEFAULT_ACTION;
- boolean isForBoth = mLockWallpaperColors == null || mLockWallpaperColors.equals(
- mHomeWallpaperColors);
-
- if (TextUtils.equals(colorOption.getSource(), COLOR_SOURCE_PRESET)) {
- action = StyleEnums.COLOR_PRESET_APPLIED;
- } else if (isForBoth) {
- action = StyleEnums.COLOR_WALLPAPER_HOME_LOCK_APPLIED;
- } else {
- switch (colorOption.getSource()) {
- case COLOR_SOURCE_HOME:
- action = StyleEnums.COLOR_WALLPAPER_HOME_APPLIED;
- break;
- case COLOR_SOURCE_LOCK:
- action = StyleEnums.COLOR_WALLPAPER_LOCK_APPLIED;
- break;
- }
- }
- return action;
- }
-
- private View.AccessibilityDelegate createAccessibilityDelegate(String id) {
- return new View.AccessibilityDelegate() {
- @Override
- public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
- super.onInitializeAccessibilityNodeInfo(host, info);
- info.setUniqueId(id);
- }
- };
- }
-
- private class ColorSectionAdapter extends
- RecyclerView.Adapter<ColorSectionAdapter.ColorPageViewHolder> {
-
- private final int mItemCounts = new int[]{WALLPAPER_TAB_INDEX, PRESET_TAB_INDEX}.length;
- private int mNumColors;
-
- @Override
- public int getItemCount() {
- return mItemCounts;
- }
-
- @Override
- public void onBindViewHolder(ColorPageViewHolder viewHolder, int position) {
- switch (position) {
- case WALLPAPER_TAB_INDEX:
- setupColorPages(viewHolder.mContainer, mNumColors, position,
- mWallpaperColorOptions, viewHolder.mPageIndicator);
- break;
- case PRESET_TAB_INDEX:
- setupColorPages(viewHolder.mContainer, mNumColors, position,
- mPresetColorOptions, viewHolder.mPageIndicator);
- break;
- default:
- break;
- }
- }
-
- @Override
- public ColorPageViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
- return new ColorPageViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(
- viewType, viewGroup, false));
- }
-
- @Override
- public int getItemViewType(int position) {
- return R.layout.color_pages_view;
- }
-
- public void setNumColors(int numColors) {
- mNumColors = numColors;
- }
-
- private class ColorPageViewHolder extends RecyclerView.ViewHolder {
- private ViewPager2 mContainer;
- private PageIndicator mPageIndicator;
-
- ColorPageViewHolder(View itemView) {
- super(itemView);
- mContainer = itemView.findViewById(R.id.color_page_container);
- // Correct scrolling goes under collapsing toolbar while scrolling oclor options.
- mContainer.getChildAt(0).setNestedScrollingEnabled(false);
- mPageIndicator = itemView.findViewById(R.id.color_page_indicator);
- if (ColorProvider.themeStyleEnabled) {
- mPageIndicator.setVisibility(VISIBLE);
- }
- itemView.setAccessibilityDelegate(createAccessibilityDelegate(ID_ITEMVIEW));
- mContainer.setAccessibilityDelegate(createAccessibilityDelegate(ID_CONTAINER));
- }
- }
- }
-
- private class ColorPageAdapter extends
- RecyclerView.Adapter<ColorPageAdapter.ColorOptionViewHolder> {
-
- private final boolean mPageEnabled;
- private final List<ColorOption> mColorOptions;
- private final int mColorsPerPage;
-
- private ColorPageAdapter(List<ColorOption> colorOptions, boolean pageEnabled,
- int colorsPerPage) {
- mPageEnabled = pageEnabled;
- mColorOptions = colorOptions;
- mColorsPerPage = colorsPerPage;
- }
-
- @Override
- public int getItemCount() {
- if (!mPageEnabled || !ColorProvider.themeStyleEnabled) {
- return 1;
- }
- // Color page size.
- return getNumPages(mColorsPerPage, mColorOptions.size());
- }
-
- @Override
- public void onBindViewHolder(ColorOptionViewHolder viewHolder, int position) {
- setupColorOptions(viewHolder.mContainer, mColorOptions, mPageEnabled, position,
- mColorsPerPage);
- }
-
- @Override
- public ColorOptionViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
- return new ColorOptionViewHolder(
- LayoutInflater.from(viewGroup.getContext()).inflate(viewType, viewGroup,
- false));
- }
-
- @Override
- public int getItemViewType(int position) {
- return R.layout.color_options_view;
- }
-
- private class ColorOptionViewHolder extends RecyclerView.ViewHolder {
- private RecyclerView mContainer;
-
- ColorOptionViewHolder(View itemView) {
- super(itemView);
- mContainer = itemView.findViewById(R.id.color_option_container);
- // Sets layout with margins to separate color options.
- final FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
- mContainer.getLayoutParams());
- final int margin = itemView.getContext().getResources().getDimensionPixelSize(
- R.dimen.section_horizontal_padding);
- layoutParams.setMargins(margin, /* top= */ 0, margin, /* bottom= */ 0);
- mContainer.setLayoutParams(layoutParams);
- }
- }
- }
-}
diff --git a/src/com/android/customization/model/color/ColorUtils.kt b/src/com/android/customization/model/color/ColorUtils.kt
deleted file mode 100644
index 9d925e1..0000000
--- a/src/com/android/customization/model/color/ColorUtils.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2022 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.model.color
-
-import android.content.Context
-import android.content.pm.PackageManager
-import android.content.res.Resources
-import android.os.SystemProperties
-import android.util.Log
-import androidx.annotation.ColorInt
-
-/** Utility to wrap Monet's color extraction */
-object ColorUtils {
- private const val TAG = "ColorUtils"
- private const val MONET_FLAG = "flag_monet"
- private var sSysuiRes: Resources? = null
- private var sFlagId = 0
-
- /** Returns true if color extraction is enabled in systemui. */
- @JvmStatic
- fun isMonetEnabled(context: Context): Boolean {
- var monetEnabled = SystemProperties.getBoolean("persist.systemui.flag_monet", false)
- if (!monetEnabled) {
- if (sSysuiRes == null) {
- try {
- val pm = context.packageManager
- val sysUIInfo =
- pm.getApplicationInfo(
- "com.android.systemui",
- PackageManager.GET_META_DATA or PackageManager.MATCH_SYSTEM_ONLY
- )
- if (sysUIInfo != null) {
- sSysuiRes = pm.getResourcesForApplication(sysUIInfo)
- }
- } catch (e: PackageManager.NameNotFoundException) {
- Log.w(TAG, "Couldn't read color flag, skipping section", e)
- }
- }
- if (sFlagId == 0) {
- sFlagId =
- if (sSysuiRes == null) 0
- else sSysuiRes!!.getIdentifier(MONET_FLAG, "bool", "com.android.systemui")
- }
- if (sFlagId > 0) {
- monetEnabled = sSysuiRes!!.getBoolean(sFlagId)
- }
- }
- return monetEnabled
- }
-
- @JvmStatic
- fun toColorString(@ColorInt color: Int): String {
- return String.format("%06X", 0xFFFFFF and color)
- }
-}
diff --git a/src/com/android/customization/model/color/WallpaperColorResources.java b/src/com/android/customization/model/color/WallpaperColorResources.java
deleted file mode 100644
index dc3b903..0000000
--- a/src/com/android/customization/model/color/WallpaperColorResources.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2022 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.model.color;
-
-import android.app.WallpaperColors;
-import android.content.Context;
-import android.util.SparseIntArray;
-import android.widget.RemoteViews.ColorResources;
-
-import com.android.systemui.monet.ColorScheme;
-import com.android.systemui.monet.TonalPalette;
-
-/** A class to override colors in a {@link Context} with wallpaper colors. */
-public class WallpaperColorResources {
-
- private final SparseIntArray mColorOverlay = new SparseIntArray();
-
- public WallpaperColorResources(WallpaperColors wallpaperColors) {
- ColorScheme wallpaperColorScheme = new ColorScheme(wallpaperColors, /* darkTheme= */ false);
- addOverlayColor(wallpaperColorScheme.getNeutral1(), android.R.color.system_neutral1_10);
- addOverlayColor(wallpaperColorScheme.getNeutral2(), android.R.color.system_neutral2_10);
- addOverlayColor(wallpaperColorScheme.getAccent1(), android.R.color.system_accent1_10);
- addOverlayColor(wallpaperColorScheme.getAccent2(), android.R.color.system_accent2_10);
- addOverlayColor(wallpaperColorScheme.getAccent3(), android.R.color.system_accent3_10);
- }
-
- /** Applies the wallpaper color resources to the {@code context}. */
- public void apply(Context context) {
- ColorResources.create(context, mColorOverlay).apply(context);
- }
-
- private void addOverlayColor(TonalPalette colorSchemehue, int firstResourceColorId) {
- int resourceColorId = firstResourceColorId;
- for (int color : colorSchemehue.getAllShades()) {
- mColorOverlay.put(resourceColorId, color);
- resourceColorId++;
- }
- }
-}
diff --git a/src/com/android/customization/model/grid/GridOption.java b/src/com/android/customization/model/grid/GridOption.java
index 19c5d4f..17ba115 100644
--- a/src/com/android/customization/model/grid/GridOption.java
+++ b/src/com/android/customization/model/grid/GridOption.java
@@ -49,7 +49,6 @@
};
private final String mTitle;
- private final boolean mIsCurrent;
private final String mIconShapePath;
private final GridTileDrawable mTileDrawable;
public final String name;
@@ -57,6 +56,7 @@
public final int cols;
public final Uri previewImageUri;
public final int previewPagesCount;
+ private boolean mIsCurrent;
public GridOption(String title, String name, boolean isCurrent, int rows, int cols,
Uri previewImageUri, int previewPagesCount, String iconShapePath) {
@@ -71,6 +71,10 @@
this.previewPagesCount = previewPagesCount;
}
+ public void setIsCurrent(boolean isCurrent) {
+ mIsCurrent = isCurrent;
+ }
+
protected GridOption(Parcel in) {
mTitle = in.readString();
mIsCurrent = in.readByte() != 0;
diff --git a/src/com/android/customization/model/grid/GridOptionsManager.java b/src/com/android/customization/model/grid/GridOptionsManager.java
index b7ee37f..78dbb5b 100644
--- a/src/com/android/customization/model/grid/GridOptionsManager.java
+++ b/src/com/android/customization/model/grid/GridOptionsManager.java
@@ -99,6 +99,11 @@
}
@Override
+ public void preview(GridOption option) {
+ mProvider.updateView();
+ }
+
+ @Override
public void fetchOptions(OptionsFetchedListener<GridOption> callback, boolean reload) {
sExecutorService.submit(() -> {
List<GridOption> gridOptions = mProvider.fetch(reload);
diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
index 4e775c6..8f1860e 100644
--- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
+++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
@@ -117,6 +117,10 @@
mPreviewUtils.renderPreview(bundle, callback);
}
+ void updateView() {
+ mLiveData.postValue(new Object());
+ }
+
int applyGrid(String name) {
ContentValues values = new ContentValues();
values.put("name", name);
diff --git a/src/com/android/customization/model/grid/data/repository/GridRepository.kt b/src/com/android/customization/model/grid/data/repository/GridRepository.kt
index 9a3be0c..e65c18e 100644
--- a/src/com/android/customization/model/grid/data/repository/GridRepository.kt
+++ b/src/com/android/customization/model/grid/data/repository/GridRepository.kt
@@ -38,12 +38,14 @@
suspend fun isAvailable(): Boolean
fun getOptionChanges(): Flow<Unit>
suspend fun getOptions(): GridOptionItemsModel
+ fun getSelectedOption(): GridOption?
}
class GridRepositoryImpl(
private val applicationScope: CoroutineScope,
private val manager: GridOptionsManager,
private val backgroundDispatcher: CoroutineDispatcher,
+ private val isGridApplyButtonEnabled: Boolean,
) : GridRepository {
override suspend fun isAvailable(): Boolean {
@@ -55,6 +57,8 @@
private val selectedOption = MutableStateFlow<GridOption?>(null)
+ override fun getSelectedOption() = selectedOption.value
+
override suspend fun getOptions(): GridOptionItemsModel {
return withContext(backgroundDispatcher) {
suspendCancellableCoroutine { continuation ->
@@ -62,7 +66,11 @@
object : CustomizationManager.OptionsFetchedListener<GridOption> {
override fun onOptionsLoaded(options: MutableList<GridOption>?) {
val optionsOrEmpty = options ?: emptyList()
- selectedOption.value = optionsOrEmpty.find { it.isActive(manager) }
+ // After Apply Button is added, we will rely on onSelected() method
+ // to update selectedOption.
+ if (!isGridApplyButtonEnabled || selectedOption.value == null) {
+ selectedOption.value = optionsOrEmpty.find { it.isActive(manager) }
+ }
continuation.resume(
GridOptionItemsModel.Loaded(
optionsOrEmpty.map { option -> toModel(option) }
@@ -105,18 +113,26 @@
private suspend fun onSelected(option: GridOption) {
withContext(backgroundDispatcher) {
suspendCancellableCoroutine { continuation ->
- manager.apply(
- option,
- object : CustomizationManager.Callback {
- override fun onSuccess() {
- continuation.resume(true)
- }
+ if (isGridApplyButtonEnabled) {
+ selectedOption.value?.setIsCurrent(false)
+ selectedOption.value = option
+ selectedOption.value?.setIsCurrent(true)
+ manager.preview(option)
+ continuation.resume(true)
+ } else {
+ manager.apply(
+ option,
+ object : CustomizationManager.Callback {
+ override fun onSuccess() {
+ continuation.resume(true)
+ }
- override fun onError(throwable: Throwable?) {
- continuation.resume(false)
- }
- },
- )
+ override fun onError(throwable: Throwable?) {
+ continuation.resume(false)
+ }
+ },
+ )
+ }
}
}
}
diff --git a/src/com/android/customization/model/grid/domain/interactor/GridInteractor.kt b/src/com/android/customization/model/grid/domain/interactor/GridInteractor.kt
index cdb679d..6cb00ff 100644
--- a/src/com/android/customization/model/grid/domain/interactor/GridInteractor.kt
+++ b/src/com/android/customization/model/grid/domain/interactor/GridInteractor.kt
@@ -95,4 +95,6 @@
model
}
}
+
+ fun getSelectedOptionName(): String? = repository.getSelectedOption()?.name
}
diff --git a/src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt b/src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt
index 5ca0fe0..14d1344 100644
--- a/src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt
+++ b/src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt
@@ -26,6 +26,7 @@
import androidx.lifecycle.ViewModelProvider
import androidx.transition.Transition
import androidx.transition.doOnStart
+import com.android.customization.model.grid.domain.interactor.GridInteractor
import com.android.customization.model.grid.ui.binder.GridScreenBinder
import com.android.customization.model.grid.ui.viewmodel.GridScreenViewModel
import com.android.customization.module.ThemePickerInjector
@@ -65,7 +66,8 @@
bindScreenPreview(
view,
wallpaperInfoFactory,
- injector.getWallpaperInteractor(requireContext())
+ injector.getWallpaperInteractor(requireContext()),
+ injector.getGridInteractor(requireContext())
)
val viewModelFactory = injector.getGridScreenViewModelFactory(requireContext())
@@ -84,7 +86,8 @@
bindScreenPreview(
view,
wallpaperInfoFactory,
- injector.getWallpaperInteractor(requireContext())
+ injector.getWallpaperInteractor(requireContext()),
+ injector.getGridInteractor(requireContext())
)
}
)
@@ -112,6 +115,7 @@
view: View,
wallpaperInfoFactory: CurrentWallpaperInfoFactory,
wallpaperInteractor: WallpaperInteractor,
+ gridInteractor: GridInteractor
): ScreenPreviewBinder.Binding {
return ScreenPreviewBinder.bind(
activity = requireActivity(),
@@ -127,6 +131,11 @@
R.string.grid_control_metadata_name,
),
),
+ initialExtrasProvider = {
+ val bundle = Bundle()
+ bundle.putString("name", gridInteractor.getSelectedOptionName())
+ bundle
+ },
wallpaperInfoProvider = {
suspendCancellableCoroutine { continuation ->
wallpaperInfoFactory.createCurrentWallpaperInfos(
diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java
index e5c6d04..bbe6bef 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -8,10 +8,8 @@
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
-import com.android.customization.model.color.ColorSectionController;
import com.android.customization.model.grid.GridOptionsManager;
import com.android.customization.model.grid.GridSectionController;
-import com.android.customization.model.mode.DarkModeSectionController;
import com.android.customization.model.mode.DarkModeSnapshotRestorer;
import com.android.customization.model.themedicon.ThemedIconSectionController;
import com.android.customization.model.themedicon.ThemedIconSwitchProvider;
@@ -36,7 +34,6 @@
import com.android.wallpaper.model.PermissionRequester;
import com.android.wallpaper.model.WallpaperColorsViewModel;
import com.android.wallpaper.model.WallpaperPreviewNavigator;
-import com.android.wallpaper.model.WallpaperSectionController;
import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
import com.android.wallpaper.module.CustomizationSections;
import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor;
@@ -92,7 +89,7 @@
}
@Override
- public List<CustomizationSectionController<?>> getRevampedUISectionControllersForScreen(
+ public List<CustomizationSectionController<?>> getSectionControllersForScreen(
Screen screen,
FragmentActivity activity,
LifecycleOwner lifecycleOwner,
@@ -210,57 +207,4 @@
return sectionControllers;
}
-
- @Override
- public List<CustomizationSectionController<?>> getAllSectionControllers(
- FragmentActivity activity,
- LifecycleOwner lifecycleOwner,
- WallpaperColorsViewModel wallpaperColorsViewModel,
- PermissionRequester permissionRequester,
- WallpaperPreviewNavigator wallpaperPreviewNavigator,
- CustomizationSectionNavigationController sectionNavigationController,
- @Nullable Bundle savedInstanceState,
- DisplayUtils displayUtils) {
- List<CustomizationSectionController<?>> sectionControllers = new ArrayList<>();
-
- // Wallpaper section.
- sectionControllers.add(
- new WallpaperSectionController(
- activity,
- lifecycleOwner,
- permissionRequester,
- wallpaperColorsViewModel,
- mThemedIconInteractor.isActivatedAsLiveData(),
- sectionNavigationController,
- wallpaperPreviewNavigator,
- savedInstanceState,
- displayUtils));
-
- // Theme color section.
- sectionControllers.add(new ColorSectionController(
- activity, wallpaperColorsViewModel, lifecycleOwner, savedInstanceState));
-
- // Dark/Light theme section.
- sectionControllers.add(new DarkModeSectionController(
- activity,
- lifecycleOwner.getLifecycle(),
- mDarkModeSnapshotRestorer));
-
- // Themed app icon section.
- sectionControllers.add(new ThemedIconSectionController(
- ThemedIconSwitchProvider.getInstance(activity),
- mThemedIconInteractor,
- savedInstanceState,
- mThemedIconSnapshotRestorer));
-
- // App grid section.
- sectionControllers.add(
- new GridSectionController(
- GridOptionsManager.getInstance(activity),
- sectionNavigationController,
- lifecycleOwner,
- /* isRevampedUiEnabled= */ false));
-
- return sectionControllers;
- }
}
diff --git a/src/com/android/customization/module/StatsLogUserEventLogger.java b/src/com/android/customization/module/StatsLogUserEventLogger.java
index 057234b..647cdc9 100644
--- a/src/com/android/customization/module/StatsLogUserEventLogger.java
+++ b/src/com/android/customization/module/StatsLogUserEventLogger.java
@@ -163,6 +163,16 @@
.log();
}
+ @Override
+ public void logEffectForegroundDownload(String effect, @EffectStatus int status,
+ long timeElapsedMillis) {
+ new SysUiStatsLogger(StyleEnums.WALLPAPER_EFFECT_FG_DOWNLOAD)
+ .setEffectPreference(status)
+ .setEffectIdHash(getIdHashCode(effect))
+ .setTimeElapsed(timeElapsedMillis)
+ .log();
+ }
+
@Nullable
private String getThemePackage(ThemeBundle theme, String category) {
Map<String, String> packages = theme.getPackagesByCategory();
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 653c403..80960aa 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -31,6 +31,7 @@
import androidx.lifecycle.ViewModelProvider
import com.android.customization.model.color.ColorCustomizationManager
import com.android.customization.model.color.ColorOptionsProvider
+import com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_PRESET
import com.android.customization.model.grid.GridOptionsManager
import com.android.customization.model.grid.data.repository.GridRepositoryImpl
import com.android.customization.model.grid.domain.interactor.GridInteractor
@@ -69,6 +70,7 @@
import com.android.systemui.shared.clocks.ClockRegistry
import com.android.systemui.shared.customization.data.content.CustomizationProviderClient
import com.android.systemui.shared.customization.data.content.CustomizationProviderClientImpl
+import com.android.wallpaper.config.BaseFlags
import com.android.wallpaper.dispatchers.BackgroundDispatcher
import com.android.wallpaper.dispatchers.MainDispatcher
import com.android.wallpaper.model.LiveWallpaperInfo
@@ -571,7 +573,7 @@
.also { gridScreenViewModelFactory = it }
}
- private fun getGridInteractor(
+ fun getGridInteractor(
context: Context,
): GridInteractor {
val appContext = context.applicationContext
@@ -583,6 +585,8 @@
applicationScope = getApplicationCoroutineScope(),
manager = GridOptionsManager.getInstance(context),
backgroundDispatcher = bgDispatcher,
+ isGridApplyButtonEnabled =
+ BaseFlags.get().isGridApplyButtonEnabled(appContext),
),
snapshotRestorer = { getGridSnapshotRestorer(appContext) },
)
@@ -599,6 +603,12 @@
.also { gridSnapshotRestorer = it }
}
+ override fun isCurrentSelectedColorPreset(context: Context): Boolean {
+ val colorManager =
+ ColorCustomizationManager.getInstance(context, OverlayManagerCompat(context))
+ return COLOR_SOURCE_PRESET == colorManager.currentColorSource
+ }
+
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
deleted file mode 100644
index 06cf753..0000000
--- a/src/com/android/customization/picker/HorizontalTouchMovementAwareNestedScrollView.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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/ui/binder/ClockCarouselViewBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
index 89fac89..7880d82 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
@@ -16,8 +16,6 @@
package com.android.customization.picker.clock.ui.binder
import android.content.Context
-import android.view.ViewGroup
-import android.widget.FrameLayout
import androidx.core.view.isVisible
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
@@ -27,7 +25,6 @@
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.picker.customization.ui.section.ScreenPreviewClickView
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.launch
@@ -38,7 +35,6 @@
fun bind(
context: Context,
carouselView: ClockCarouselView,
- singleClockView: ViewGroup,
screenPreviewClickView: ScreenPreviewClickView,
viewModel: ClockCarouselViewModel,
clockViewFactory: ClockViewFactory,
@@ -46,6 +42,7 @@
isTwoPaneAndSmallWidth: Boolean,
) {
carouselView.setClockViewFactory(clockViewFactory)
+ carouselView.isVisible = true
clockViewFactory.updateRegionDarkness()
val carouselAccessibilityDelegate =
CarouselAccessibilityDelegate(
@@ -61,12 +58,8 @@
)
screenPreviewClickView.accessibilityDelegate = carouselAccessibilityDelegate
- val singleClockHostView =
- singleClockView.requireViewById<FrameLayout>(R.id.single_clock_host_view)
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
- launch { viewModel.isCarouselVisible.collect { carouselView.isVisible = it } }
-
launch {
combine(viewModel.selectedClockSize, viewModel.allClocks, ::Pair).collect {
(size, allClocks) ->
@@ -98,21 +91,6 @@
launch {
viewModel.seedColor.collect { clockViewFactory.updateColorForAllClocks(it) }
}
-
- launch {
- viewModel.isSingleClockViewVisible.collect { singleClockView.isVisible = it }
- }
-
- launch {
- viewModel.clockId.collect { clockId ->
- singleClockHostView.removeAllViews()
- val clockView = clockViewFactory.getLargeView(clockId)
- // The clock view might still be attached to an existing parent. Detach
- // before adding to another parent.
- (clockView.parent as? ViewGroup)?.removeView(clockView)
- singleClockHostView.addView(clockView)
- }
- }
}
}
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 aa6cc91..2d18ab3 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
@@ -114,6 +114,7 @@
}
adapter = ClockCarouselAdapter(clockSize, clocks, clockViewFactory, onClockSelected)
+ carousel.isInfinite = clocks.size >= MIN_CLOCKS_TO_ENABLE_INFINITE_CAROUSEL
carousel.setAdapter(adapter)
val indexOfSelectedClock =
clocks
@@ -470,6 +471,8 @@
}
companion object {
+ // The carousel needs to have at least 5 different clock faces to be infinite
+ const val MIN_CLOCKS_TO_ENABLE_INFINITE_CAROUSEL = 5
const val CLOCK_CAROUSEL_VIEW_SCALE = 0.5f
val itemViewIds =
diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt
index 7922054..b2dfa61 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt
@@ -27,7 +27,6 @@
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapLatest
@@ -39,8 +38,7 @@
* Clock carousel view model that provides data for the carousel of clock previews. When there is
* only one item, we should show a single clock preview instead of a carousel.
*/
-class ClockCarouselViewModel
-constructor(
+class ClockCarouselViewModel(
private val interactor: ClockPickerInteractor,
private val backgroundDispatcher: CoroutineDispatcher,
) : ViewModel() {
@@ -58,8 +56,6 @@
val seedColor: Flow<Int?> = interactor.seedColor
- val isCarouselVisible: Flow<Boolean> = allClocks.map { it.size > 1 }.distinctUntilChanged()
-
@OptIn(ExperimentalCoroutinesApi::class)
val selectedIndex: Flow<Int> =
allClocks
@@ -77,15 +73,6 @@
}
.mapNotNull { it }
- // Handle the case when there is only one clock in the carousel
- val isSingleClockViewVisible: Flow<Boolean> =
- allClocks.map { it.size == 1 }.distinctUntilChanged()
-
- val clockId: Flow<String> =
- allClocks
- .map { allClockIds -> if (allClockIds.size == 1) allClockIds[0].clockId else null }
- .mapNotNull { it }
-
private var setSelectedClockJob: Job? = null
fun setSelectedClock(clockId: String) {
setSelectedClockJob?.cancel()
diff --git a/src/com/android/customization/picker/color/ColorSectionView.java b/src/com/android/customization/picker/color/ColorSectionView.java
deleted file mode 100644
index b8ba2e4..0000000
--- a/src/com/android/customization/picker/color/ColorSectionView.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2022 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.color;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.Nullable;
-
-import com.android.wallpaper.picker.SectionView;
-
-/**
- * The class inherits from {@link SectionView} as the view representing the color section of the
- * customization picker.
- */
-public final class ColorSectionView extends SectionView {
- public ColorSectionView(Context context, @Nullable AttributeSet attrs) {
- super(context, attrs);
- }
-}
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
index 45e3cde..5b0e4d4 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
@@ -112,22 +112,20 @@
val optionSelectedView = itemView.findViewById<ImageView>(R.id.option_selected)
lifecycleOwner.lifecycleScope.launch {
- lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
- launch {
- item.isSelected.collect { isSelected ->
- optionSelectedView.isVisible = isSelected
- }
+ launch {
+ item.isSelected.collect { isSelected ->
+ optionSelectedView.isVisible = isSelected
}
- launch {
- item.onClicked.collect { onClicked ->
- itemView.setOnClickListener(
- if (onClicked != null) {
- View.OnClickListener { onClicked.invoke() }
- } else {
- null
- }
- )
- }
+ }
+ launch {
+ item.onClicked.collect { onClicked ->
+ itemView.setOnClickListener(
+ if (onClicked != null) {
+ View.OnClickListener { onClicked.invoke() }
+ } else {
+ null
+ }
+ )
}
}
}
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 fa87029..2174ba7 100644
--- a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
+++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
@@ -23,7 +23,6 @@
import android.view.TouchDelegate
import android.view.View
import android.view.View.OnAttachStateChangeListener
-import android.view.ViewGroup
import android.view.ViewStub
import androidx.activity.ComponentActivity
import androidx.constraintlayout.helper.widget.Carousel
@@ -156,12 +155,6 @@
guidelineEnd.layoutParams = layoutParams
}
- // TODO (b/270716937) We should handle the single clock case in the clock carousel
- // itself
- val singleClockViewStub: ViewStub = view.requireViewById(R.id.single_clock_view_stub)
- singleClockViewStub.layoutResource = R.layout.single_clock_view
- val singleClockView = singleClockViewStub.inflate() as ViewGroup
-
/**
* Only bind after [Carousel.onAttachedToWindow]. This is to avoid the race condition
* that the flow emits before attached to window where [Carousel.mMotionLayout] is still
@@ -177,7 +170,6 @@
ClockCarouselViewBinder.bind(
context = context,
carouselView = carouselView,
- singleClockView = singleClockView,
screenPreviewClickView = screenPreviewClickView,
viewModel = viewModel,
clockViewFactory = clockViewFactory,
diff --git a/tests/robotests/src/com/android/customization/model/color/ColorSectionControllerTest.java b/tests/robotests/src/com/android/customization/model/color/ColorSectionControllerTest.java
deleted file mode 100644
index 4e1a36a..0000000
--- a/tests/robotests/src/com/android/customization/model/color/ColorSectionControllerTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2022 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.model.color;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.android.wallpaper.model.WallpaperColorsViewModel;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-/**
- * Tests of {@link ColorSectionController}.
- */
-@Ignore("b/290798811")
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public final class ColorSectionControllerTest {
-
- private AppCompatActivity mActivity;
- private ColorSectionController mColorSectionController;
-
- /**
- * Set up the test case.
- */
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mActivity = Robolectric.buildActivity(AppCompatActivity.class).create().get();
- mColorSectionController = new ColorSectionController(mActivity,
- new WallpaperColorsViewModel(), mActivity, null);
- }
-
- /**
- * isAvailable()'s test.
- */
- @Test
- @Config(manifest = Config.NONE)
- public void isAvailable_nullContext_shouldReturnFalse() {
- assertThat(mColorSectionController.isAvailable(/* context= */ null)).isFalse();
- }
-}
-
diff --git a/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt b/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt
index 5953937..0c80e28 100644
--- a/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt
+++ b/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt
@@ -17,6 +17,7 @@
package com.android.customization.model.grid.data.repository
+import com.android.customization.model.grid.GridOption
import com.android.customization.model.grid.shared.model.GridOptionItemModel
import com.android.customization.model.grid.shared.model.GridOptionItemsModel
import kotlinx.coroutines.CoroutineScope
@@ -51,6 +52,8 @@
return options
}
+ override fun getSelectedOption(): GridOption? = null
+
fun setOptions(
count: Int,
selectedIndex: Int = 0,
diff --git a/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt b/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt
index 1b1eb9a..ca6f8c7 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt
@@ -88,38 +88,6 @@
assertThat(observedSelectedIndex()).isEqualTo(2)
}
- @Test
- fun multipleClockCase() = runTest {
- underTest =
- ClockCarouselViewModel(
- getClockPickerInteractor(repositoryWithMultipleClocks),
- testDispatcher
- )
- val observedIsCarouselVisible = collectLastValue(underTest.isCarouselVisible)
- val observedIsSingleClockViewVisible = collectLastValue(underTest.isSingleClockViewVisible)
-
- advanceTimeBy(ClockCarouselViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
-
- assertThat(observedIsCarouselVisible()).isTrue()
- assertThat(observedIsSingleClockViewVisible()).isFalse()
- }
-
- @Test
- fun singleClockCase() = runTest {
- underTest =
- ClockCarouselViewModel(
- getClockPickerInteractor(repositoryWithSingleClock),
- testDispatcher
- )
- val observedIsCarouselVisible = collectLastValue(underTest.isCarouselVisible)
- val observedIsSingleClockViewVisible = collectLastValue(underTest.isSingleClockViewVisible)
-
- advanceTimeBy(ClockCarouselViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
-
- assertThat(observedIsCarouselVisible()).isFalse()
- assertThat(observedIsSingleClockViewVisible()).isTrue()
- }
-
private fun getClockPickerInteractor(repository: ClockPickerRepository): ClockPickerInteractor {
return ClockPickerInteractor(
repository = repository,