Merge "Refactor Clock theme handling" into main
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index aab0643..a5eb1a7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Klein"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"’n Klein horlosie word in die hoek van jou skerm gewys"</string>
<string name="grid_title" msgid="1688173478777254123">"Approoster"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Appvorm & uitleg"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Uitleg"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Pas toe"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tik om te wysig"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Hou huidige muurpapier"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index dea744f..f9d37ec 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ትንሽ"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"በእርስዎ ማያ ገፅ ጥግ ላይ ትንሽ ሰዓት ይታያል"</string>
<string name="grid_title" msgid="1688173478777254123">"የመተግበሪያ ፍርግርግ"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"የመተግበሪያ ቅርጽ እና አቀማመጥ"</string>
+ <string name="grid_layout" msgid="370175667652663686">"አቀማመጥ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ተግብር"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ለማርትዕ መታ ያድርጉ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"የአሁኑን ልጣፍ ያቆዩት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4efd2af..d711f70 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"صغير"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"تظهر ساعة صغيرة في زاوية الشاشة"</string>
<string name="grid_title" msgid="1688173478777254123">"شبكة التطبيقات"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"شكل التطبيق وتصميمه"</string>
+ <string name="grid_layout" msgid="370175667652663686">"التصميم"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"تطبيق"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"انقُر للتعديل."</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"الاحتفاظ بالخلفية الحالية"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index b186b31..411879c 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"সৰু"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"আপোনাৰ স্ক্ৰীনখনৰ চুকত এটা সৰু ঘড়ীয়ে দেখুৱায়"</string>
<string name="grid_title" msgid="1688173478777254123">"এপৰ গ্ৰিড"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"এপৰ আকৃতি আৰু লে’আউট"</string>
+ <string name="grid_layout" msgid="370175667652663686">"লে’আউট"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"প্ৰয়োগ কৰক"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"সম্পাদনা কৰিবলৈ টিপক"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"বৰ্তমানৰ ৱালপেপাৰখন ৰাখক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index fb811ba..9c5312b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Kiçik"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Ekranın mərkəzində kiçik saat görünür"</string>
<string name="grid_title" msgid="1688173478777254123">"Tətbiq toru"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Tətbiq forması və düzən"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Düzən"</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>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Cari divar kağızını saxlayın"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index cb606e0..be31f3c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Mali"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Mali sat se prikazuje u uglu ekrana"</string>
<string name="grid_title" msgid="1688173478777254123">"Mreža apl."</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Oblik i izgled"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Izgled"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da biste izmenili"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Zadrži aktuelnu pozadinu"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 37d3d96..cefce68 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Дробны"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Невялікі гадзіннік у вугле экрана"</string>
<string name="grid_title" msgid="1688173478777254123">"Сетка праграм"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Форма і кампаноўка праграмы"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Макет"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ужыць"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Дакраніцеся, каб рэдагаваць"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Захаваць бягучыя шпалеры"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ecf1221..1ddbd7b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Малък"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"В ъгъла на екрана се показва малък часовник"</string>
<string name="grid_title" msgid="1688173478777254123">"Решетка с прил."</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Оформление и форма"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Оформление"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Прилагане"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Докоснете, за да редактирате"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Запазване на текущия тапет"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 53bd416..98c51d6 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ছোট করুন"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"স্ক্রিনের কোনায় একটি ছোট ঘড়ি দেখানো হয়"</string>
<string name="grid_title" msgid="1688173478777254123">"অ্যাপ গ্রিড"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"অ্যাপ শেপ ও লেআউট"</string>
+ <string name="grid_layout" msgid="370175667652663686">"লেআউট"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"প্রয়োগ করুন"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"এডিট করতে ট্যাপ করুন"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"এখন যে ওয়ালপেপার আছে সেটি রাখুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4b7bdc4..b600f86 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Malo"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Mali sat se prikazuje u uglu vašeg ekrana"</string>
<string name="grid_title" msgid="1688173478777254123">"Mreža aplikacija"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Oblik i raspored apl."</string>
+ <string name="grid_layout" msgid="370175667652663686">"Raspored"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primijeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da uredite"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Zadrži trenutnu pozadinsku sliku"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index eade8a0..cfe9860 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Petit"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Es mostra un rellotge petit a l\'extrem de la pantalla"</string>
<string name="grid_title" msgid="1688173478777254123">"Quadrícula d\'apps"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Forma i disseny d\'app"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Disseny"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplica"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca per editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantén el fons de pantalla actual"</string>
@@ -78,7 +76,7 @@
<string name="applied_theme_msg" msgid="3749018706366796244">"L\'estil s\'ha definit correctament"</string>
<string name="applied_clock_msg" msgid="1303338016701443767">"El rellotge s\'ha definit correctament"</string>
<string name="applied_grid_msg" msgid="3250499654436933034">"La quadrícula s\'ha definit correctament"</string>
- <string name="apply_theme_error_msg" msgid="791364062636538317">"S\'ha produït un error en aplicar l\'estil"</string>
+ <string name="apply_theme_error_msg" msgid="791364062636538317">"Hi ha hagut un error en aplicar l\'estil"</string>
<string name="custom_theme_next" msgid="6235420097213197301">"Següent"</string>
<string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
<string name="custom_theme" msgid="1618351922263478163">"Personalitzat"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 579614c..57869ff 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Malá"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"V rohu obrazovky se zobrazují malé hodiny"</string>
<string name="grid_title" msgid="1688173478777254123">"Mřížka aplikací"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Tvar a rovrž."</string>
+ <string name="grid_layout" msgid="370175667652663686">"Rozvržení"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Použít"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Klepnutím upravte"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Zachovat stávající tapetu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8d9c27f..9ff8a43 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Lille"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Et lille ur vises i hjørnet af skærmen"</string>
<string name="grid_title" msgid="1688173478777254123">"Appgitter"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Appform og layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Anvend"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tryk for at redigere"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Behold den aktuelle baggrund"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 48058ac..7a4dadb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Klein"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Eine kleine Uhr wird in der Ecke des Displays angezeigt"</string>
<string name="grid_title" msgid="1688173478777254123">"App-Raster"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Formen & Layouts"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Anwenden"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Zum Bearbeiten tippen"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Aktuellen Hintergrund behalten"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4b00f25..0c75a68 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Μικρό"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Ένα μικρό ρολόι εμφανίζεται στη γωνία της οθόνης"</string>
<string name="grid_title" msgid="1688173478777254123">"Πλέγμα εφαρμ."</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Σχήμα, διάταξη"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Διάταξη"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Εφαρμογή"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Πατήστε για επεξεργασία"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Διατήρηση τρέχουσας ταπετσαρίας"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0d07ab8..4289a97 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -44,10 +44,8 @@
<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>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"App shape and layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0d07ab8..4289a97 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -44,10 +44,8 @@
<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>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"App shape and layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0d07ab8..4289a97 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -44,10 +44,8 @@
<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>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"App shape and layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fd54ee1..72b1eb3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Pequeño"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Aparece un reloj pequeño en la esquina de tu pantalla"</string>
<string name="grid_title" msgid="1688173478777254123">"Cuadrícula de apps"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Forma y diseño"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Diseño"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Presiona para editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Conservar fondo de pantalla actual"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d57d4db..e78077e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Pequeño"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Se muestra un pequeño reloj en la esquina de la pantalla"</string>
<string name="grid_title" msgid="1688173478777254123">"Cuadrícula de apps"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Forma y diseño"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Diseño"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca para editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantener fondo de pantalla actual"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index d654e17..70b20c9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Väike"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Ekraaninurgas kuvatakse väike kell"</string>
<string name="grid_title" msgid="1688173478777254123">"Rak. ruudustik"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Rakenduse kuju ja paigutus"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Paigutus"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Rakenda"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Puudutage muutmiseks"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Säilita praegune taustapilt"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4277260..050e73a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Txikia"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Erloju txiki bat agertzen da pantailaren izkinan"</string>
<string name="grid_title" msgid="1688173478777254123">"Aplikazioen sareta"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Aplikazioaren forma eta diseinua"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Diseinua"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplikatu"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Sakatu editatzeko"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Utzi bere horretan horma-papera"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3eab0f3..f0f97bb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"کوچک"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"ساعت کوچکی در گوشه صفحهنمایش شما نشان داده میشود"</string>
<string name="grid_title" msgid="1688173478777254123">"شبکه برنامهها"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"شکل و چیدمان برنامه"</string>
+ <string name="grid_layout" msgid="370175667652663686">"چیدمان"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"اعمال"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"برای ویرایش تکضرب بزنید"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"حفظ کاغذدیواری فعلی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2812761..eed1ce1 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Pieni"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Näytön reunassa näkyy pieni kello"</string>
<string name="grid_title" msgid="1688173478777254123">"Ruudukko"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Muoto ja asettelu"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Asettelu"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Käytä"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Muokkaa napauttamalla"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Säilytä nykyinen taustakuva"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b89f2a1..9c1f11b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Petite"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Une petite horloge s\'affiche dans le coin de votre écran"</string>
<string name="grid_title" msgid="1688173478777254123">"Grille d\'applis"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Mise en page"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Mise en page"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Appliquer"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toucher pour modifier"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Garder le fond d\'écran actuel"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cfd8428..d88eb36 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Petite"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Une petite horloge s\'affiche dans le coin de votre écran"</string>
<string name="grid_title" msgid="1688173478777254123">"Grille d\'applis"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Forme et mise en page de l\'appli"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Mise en page"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Appliquer"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Appuyer pour modifier"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Conserver le fond d\'écran actuel"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index b3f90c0..f7a93de 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Pequeno"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Un pequeno reloxo móstrase na esquina da pantalla"</string>
<string name="grid_title" msgid="1688173478777254123">"Grade de apps"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Deseño e forma da app"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Deseño"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca para editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Conservar fondo de pantalla actual"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1b03731..265f9aa 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"નાનું"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"તમારી સ્ક્રીનના ખૂણામાં એક નાની ઘડિયાળ દેખાય છે"</string>
<string name="grid_title" msgid="1688173478777254123">"ઍપ ગ્રિડ"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ઍપનો આકાર+લેઆઉટ"</string>
+ <string name="grid_layout" msgid="370175667652663686">"લેઆઉટ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"લાગુ કરો"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ફેરફાર કરવા માટે ટૅપ કરો"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"હાલનું વૉલપેપર રાખો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9da2dfc..c0521f3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"छोटा"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"आपके डिवाइस की स्क्रीन के कोने में एक छोटी घड़ी दिखती है"</string>
<string name="grid_title" msgid="1688173478777254123">"ऐप्लिकेशन ग्रिड"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ऐप का शेप और लेआउट"</string>
+ <string name="grid_layout" msgid="370175667652663686">"लेआउट"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"लागू करें"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"बदलाव करने के लिए टैप करें"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"मौजूदा वॉलपेपर बनाए रखें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 844eb34..dc723c5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Mali sat"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"U kutu zaslona prikazuje se mali sat"</string>
<string name="grid_title" msgid="1688173478777254123">"Rešetka aplikacija"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Oblik i izgled aplikacije"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Izgled"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primijeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da biste uredili"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Zadrži trenutačnu pozadinu"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index cb0c9ae..c58c268 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Kicsi"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Megjelenik egy kis óra a képernyő sarkában."</string>
<string name="grid_title" msgid="1688173478777254123">"Alkalmazásrács"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Forma és elrendezés"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Elrendezés"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Alkalmaz"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Koppintson a szerkesztéshez"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Jelenlegi háttérkép megtartása"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1adac46..e9f1b73 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Փոքր"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Էկրանի անկյունում ցուցադրվում է փոքրիկ ժամացույց"</string>
<string name="grid_title" msgid="1688173478777254123">"Հավելվածների ցանց"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Ձև և դասավորություն"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Դասավորություն"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Կիրառել"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Հպեք՝ փոփոխելու համար"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Պահպանել ընթացիկ պաստառը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ef60388..a373541 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Kecil"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Jam kecil ditampilkan di sudut layar"</string>
<string name="grid_title" msgid="1688173478777254123">"Petak aplikasi"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Bentuk & tata letak aplikasi"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Tata letak"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Terapkan"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketuk untuk mengedit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Pertahankan wallpaper saat ini"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 8a3fc1b..059f473 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Lítil"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Lítil klukka birtist í horni skjásins"</string>
<string name="grid_title" msgid="1688173478777254123">"Forritatafla"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Lögun forrits og uppsetning"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Útlit"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Nota"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ýttu til að breyta"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Halda núverandi veggfóðri"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8f75181..2ce6ee4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Piccole"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Un piccolo orologio visualizzato nell\'angolo dello schermo"</string>
<string name="grid_title" msgid="1688173478777254123">"Griglia di app"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Layout/Forma app"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Applica"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tocca per modificare"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantieni lo sfondo corrente"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 93548f1..35640ed 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"קטן"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"שעון קטן מופיע בפינת המסך"</string>
<string name="grid_title" msgid="1688173478777254123">"תצוגת האפליקציות"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"הצורה והפריסה של האפליקציה"</string>
+ <string name="grid_layout" msgid="370175667652663686">"פריסה"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"אישור"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"יש להקיש כדי לערוך"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"שמירת הטפט הנוכחי"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e587425..4aabafa 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"画面の隅に小さい時計を表示します"</string>
<string name="grid_title" msgid="1688173478777254123">"アプリグリッド"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"アプリの形状とレイアウト"</string>
+ <string name="grid_layout" msgid="370175667652663686">"レイアウト"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"適用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"タップして編集"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"現在の壁紙を保持"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 761e5c0..a34861b 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"პატარა"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"პატარა საათი მოთავსებულია თქვენი ეკრანის კუთხეში"</string>
<string name="grid_title" msgid="1688173478777254123">"აპების ბადე"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"აპის ფორმა და განლაგება"</string>
+ <string name="grid_layout" msgid="370175667652663686">"განლაგება"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"მისადაგება"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"შეეხეთ რედაქტირებისთვის"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ამჟამინდელი ფონის შენარჩუნება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 46b62c6..244dde1 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Кішi"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Экранның бұрышында шағын сағат көрсетіледі."</string>
<string name="grid_title" msgid="1688173478777254123">"Қолданбалар торы"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Пішін, формат"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Формат"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Қолдану"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Өзгерту үшін түртіңіз"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Қазіргі тұсқағазды қалдыру"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 47465ef..46f0b41 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"តូច"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"នាឡិកាតូចមួយបង្ហាញនៅជ្រុងនៃអេក្រង់របស់អ្នក"</string>
<string name="grid_title" msgid="1688173478777254123">"ក្រឡាកម្មវិធី"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"រូបរាង និងប្លង់កម្មវិធី"</string>
+ <string name="grid_layout" msgid="370175667652663686">"ប្លង់"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ប្រើ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ចុច ដើម្បីកែ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"រក្សាទុកផ្ទាំងរូបភាពបច្ចុប្បន្ន"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ec8ff98..55632a5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ಚಿಕ್ಕದು"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ನ ಮೂಲೆಯಲ್ಲಿ ಸಣ್ಣ ಗಡಿಯಾರವೊಂದು ಕಾಣಿಸುತ್ತದೆ"</string>
<string name="grid_title" msgid="1688173478777254123">"ಆ್ಯಪ್ ಗ್ರಿಡ್"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ಆ್ಯಪ್ ಆಕಾರ, ಲೇಔಟ್"</string>
+ <string name="grid_layout" msgid="370175667652663686">"ಲೇಔಟ್"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ಅನ್ವಯಿಸಿ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ಎಡಿಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ಪ್ರಸ್ತುತ ವಾಲ್ಪೇಪರ್ ಅನ್ನು ಉಳಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d3502db..b37fd42 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"작게"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"작은 시계가 화면 모서리에 표시됩니다."</string>
<string name="grid_title" msgid="1688173478777254123">"앱 그리드"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"앱 모양 및 레이아웃"</string>
+ <string name="grid_layout" msgid="370175667652663686">"레이아웃"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"적용"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"탭하여 수정"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"현재 배경화면 유지"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c7863bd..a9ed407 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Кичине"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Кичинекей саат экрандын бурчунда көрүнүп турат"</string>
<string name="grid_title" msgid="1688173478777254123">"Колдонмолор торчосу"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Формасы, калыбы"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Калып"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Колдонуу"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Өзгөртүү үчүн таптап коюңуз"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Учурдагы тушкагаз калсын"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index c7ce2ee..cf7109d 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ນ້ອຍ"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"ໂມງນ້ອຍທີ່ສະແດງຢູ່ໃນມຸມຂອງໜ້າຈໍທ່ານ"</string>
<string name="grid_title" msgid="1688173478777254123">"ຕາຕະລາງແອັບ"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ຮູບຮ່າງ ແລະ ໂຄງຮ່າງແອັບ"</string>
+ <string name="grid_layout" msgid="370175667652663686">"ໂຄງຮ່າງ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ນຳໃຊ້"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ແຕະເພື່ອແກ້ໄຂ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ໃຊ້ຮູບພື້ນຫຼັງປັດຈຸບັນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 169acb5..4c66981 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Mažas"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Ekrano kampe rodomas nedidelis laikrodis"</string>
<string name="grid_title" msgid="1688173478777254123">"Pr. tinklelis"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Progr. forma ir išd."</string>
+ <string name="grid_layout" msgid="370175667652663686">"Išdėstymas"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Taikyti"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Palieskite ir redaguokite"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Palikti dabartinį ekrano foną"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 35d9bef..f9383a5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Mazs"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Jūsu ekrāna stūrī tiek rādīts neliels pulkstenis."</string>
<string name="grid_title" msgid="1688173478777254123">"Lietotņu režģis"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Lietotnes forma un izkārtojums"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Izkārtojums"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Lietot"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Pieskarieties, lai rediģētu"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Paturēt pašreizējo fona tapeti"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 01e6215..82430b9 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Мала"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Во аголот на екранот се прикажува мал часовник"</string>
<string name="grid_title" msgid="1688173478777254123">"Мрежа"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Распоред и форма"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Распоред"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Примени"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Допрете за да измените"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Задржи тековен тапет"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3fbd693..2665914 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ചെറുത്"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"സ്ക്രീനിന്റെ മൂലയിൽ ഒരു ചെറിയ ക്ലോക്ക് കാണിക്കുന്നു"</string>
<string name="grid_title" msgid="1688173478777254123">"ആപ്പ് ഗ്രിഡ്"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ആപ്പ് രൂപവും ലേഔട്ടും"</string>
+ <string name="grid_layout" msgid="370175667652663686">"ലേഔട്ട്"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"പ്രയോഗിക്കുക"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"എഡിറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"നിലവിലെ വാൾപേപ്പർ നിലനിർത്തുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index dc71165..09ba978 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Жижиг"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Таны дэлгэцийн буланд жижиг цаг харуулдаг"</string>
<string name="grid_title" msgid="1688173478777254123">"Аппын хүснэгт"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Аппын хэлбэр, бүдүүвч"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Бүдүүвч"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ашиглах"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Засахын тулд товшино уу"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Одоогийн дэлгэцийн зургийг хадгалах"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index da52ce2..ccdbeb3 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"छोटे"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"तुमच्या स्क्रीनच्या कोपऱ्यामध्ये एक लहान घड्याळ दिसते"</string>
<string name="grid_title" msgid="1688173478777254123">"ॲप ग्रिड"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"अॅप आकार व लेआउट"</string>
+ <string name="grid_layout" msgid="370175667652663686">"लेआउट"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"लागू करा"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"संपादित करण्यासाठी टॅप करा"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"सध्याचा वॉलपेपर ठेवा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 743e967..92221e2 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Kecil"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Jam kecil dipaparkan di penjuru skrin"</string>
<string name="grid_title" msgid="1688173478777254123">"Grid apl"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Bentuk & reka letak apl"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Reka letak"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Gunakan"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketik untuk edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Kekalkan kertas dinding semasa"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 301b765..9b91b12 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"သေး"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"သင့်ဖန်သားပြင်ထောင့်တွင် ပြသထားသော နာရီအသေးတစ်ခု"</string>
<string name="grid_title" msgid="1688173478777254123">"အက်ပ်ဇယား"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"အက်ပ်ပုံစံ၊ အပြင်အဆင်"</string>
+ <string name="grid_layout" msgid="370175667652663686">"အပြင်အဆင်"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"အသုံးပြုရန်"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"တည်းဖြတ်ရန် တို့ပါ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"လက်ရှိနောက်ခံပုံ ဆက်ထားရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2550b06..0ded53b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Liten"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"En liten klokke vises i hjørnet av skjermen"</string>
<string name="grid_title" msgid="1688173478777254123">"Apprutenett"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Appform/-layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Oppsett"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Bruk"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Trykk for å endre"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Behold den nåværende bakgrunnen"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0092176..cdb170f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"सानो"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"तपाईंको स्क्रिनको कुनामा सानो घडी देखा पर्छ"</string>
<string name="grid_title" msgid="1688173478777254123">"एप ग्रिड"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"एपको आकार र लेआउट"</string>
+ <string name="grid_layout" msgid="370175667652663686">"लेआउट"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"लागू गर्नुहोस्"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"सम्पादन गर्न ट्याप गर्नुहोस्"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"अहिले कै वालपेपर राख्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b98d289..11c888d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Klein"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Er wordt een kleine klok weergegeven in de hoek van het scherm"</string>
<string name="grid_title" msgid="1688173478777254123">"App-raster"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Vorm en indeling van app"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Indeling"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Toepassen"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tik om te bewerken"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Huidige achtergrond behouden"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index b2c94e7..5087603 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ଛୋଟ"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"ଆପଣଙ୍କ ସ୍କ୍ରିନର କୋଣରେ ଏକ ଛୋଟ ଘଣ୍ଟା ଦେଖାଯାଏ"</string>
<string name="grid_title" msgid="1688173478777254123">"ଆପ ଗ୍ରିଡ"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ଆପ ଆକାର ଓ ଲେଆଉଟ"</string>
+ <string name="grid_layout" msgid="370175667652663686">"ଲେଆଉଟ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ପ୍ରୟୋଗ କରନ୍ତୁ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ଏଡିଟ କରିବା ପାଇଁ ଟାପ କରନ୍ତୁ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ବର୍ତ୍ତମାନର ୱାଲ୍ପେପର୍କୁ ରଖନ୍ତୁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8c73b77..aff8927 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"ਛੋਟਾ"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਦੇ ਕੋਨੇ \'ਤੇ ਇੱਕ ਛੋਟੀ ਘੜੀ ਦਿਖਾਈ ਦਿੰਦੀ ਹੈ"</string>
<string name="grid_title" msgid="1688173478777254123">"ਐਪ ਗ੍ਰਿਡ"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ਐਪ ਦੀ ਆਕ੍ਰਿਤੀ ਅਤੇ ਖਾਕਾ"</string>
+ <string name="grid_layout" msgid="370175667652663686">"ਖਾਕਾ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ਲਾਗੂ ਕਰੋ"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ਸੰਪਾਦਨ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ਮੌਜੂਦਾ ਵਾਲਪੇਪਰ ਬਰਕਰਾਰ ਰੱਖੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4470118..68540e2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Mały"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Mały zegar wyświetlany w rogu ekranu"</string>
<string name="grid_title" msgid="1688173478777254123">"Siatka aplikacji"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Kształt i układ aplikacji"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Układ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Zastosuj"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Kliknij, by edytować"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Pozostaw bieżącą tapetę"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3086f4e..ac69c29 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Pequeno"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Um pequeno relógio é apresentado no canto do ecrã"</string>
<string name="grid_title" msgid="1688173478777254123">"Grelha de apps"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Esquema/forma das apps"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Esquema"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toque para editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Manter a imagem de fundo atual"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 837480f..b718f44 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Pequeno"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Um relógio pequeno aparece no canto da tela"</string>
<string name="grid_title" msgid="1688173478777254123">"Grade de apps"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Formato e layout do app"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toque para editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Manter o plano de fundo atual"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cfea089..dd436a7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Mică"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Un ceas mic apare în colțul ecranului"</string>
<string name="grid_title" msgid="1688173478777254123">"Grilă aplicații"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Formă și aspect"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Aspect"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplică"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Atinge pentru a modifica"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Păstrează imaginea de fundal actuală"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b1794d1..cf47d15 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Маленький"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Небольшие часы в углу экрана"</string>
<string name="grid_title" msgid="1688173478777254123">"Сетка приложений"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Форма прил., макет"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Макет"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Применить"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Нажмите, чтобы изменить"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Использовать текущие обои"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d07d043..f17936a 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"කුඩා"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"ඔබේ තිරයේ කෙළවරේ කුඩා ඔරලෝසුවක් පෙන්වයි"</string>
<string name="grid_title" msgid="1688173478777254123">"යෙදුම් ජාලකය"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"යෙදුම් හැඩය සහ පිරිසැලසුම"</string>
+ <string name="grid_layout" msgid="370175667652663686">"පිරිසැලසුම"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"යොදන්න"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"සංස්කරණයට තට්ටු කරන්න"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"වත්මන් බිතුපත තබා ගන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4b3e677..bdea5e7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Malé"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"V rohu obrazovky sa zobrazujú malé hodiny"</string>
<string name="grid_title" msgid="1688173478777254123">"Mriežka aplikácií"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Tvar a rozloženie"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Rozloženie"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Použiť"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Klepnutím upravte"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Ponechať aktuálnu tapetu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 38cbfb2..c3c8e73 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Majhna"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"V kotu zaslona je prikazana majhna ura."</string>
<string name="grid_title" msgid="1688173478777254123">"Mreža aplikacij"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Oblika in postavitev aplikacije"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Postavitev"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Uporabi"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dotaknite se za urejanje"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Obdrži trenutno ozadje"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index ac562fc..1b3bd83 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"E vogël"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Në këndin e ekranit shfaqet një orë e vogël"</string>
<string name="grid_title" msgid="1688173478777254123">"Rrjeta e aplikacioneve"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Forma e struktura e aplikacionit"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Struktura"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Zbato"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Trokit për të modifikuar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Mbaj imazhin aktual të sfondit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3f6a6c8..2dfb7d5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Мали"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Мали сат се приказује у углу екрана"</string>
<string name="grid_title" msgid="1688173478777254123">"Мрежа апл."</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Облик и изглед"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Изглед"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Примени"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Додирните да бисте изменили"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Задржи актуелну позадину"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 69f9d27..eaf2ba4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Liten"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"En liten klockas visas i skärmens hörn"</string>
<string name="grid_title" msgid="1688173478777254123">"Apprutnät"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Form och layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</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>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Behåll befintlig bakgrund"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3f69df3..d48927a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Ndogo"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Saa ndogo inaonekana kwenye kona ya skrini yako"</string>
<string name="grid_title" msgid="1688173478777254123">"Gridi ya programu"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Muundo na umbo la programu"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Muundo"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tumia"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Gusa ili ubadilishe"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Tumia mandhari ya sasa"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 5e5a226..103740b 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"சிறியது"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"உங்கள் திரையின் மூலையில் ஒரு சிறிய கடிகாரம் காட்டப்படும்"</string>
<string name="grid_title" msgid="1688173478777254123">"ஆப்ஸ் கட்டம்"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ஆப்ஸ் வடிவம் & தளவமைப்பு"</string>
+ <string name="grid_layout" msgid="370175667652663686">"தளவமைப்பு"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"பயன்படுத்து"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"\'தீமைத்\' திருத்த தட்டவும்"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"தற்போதைய வால்பேப்பரே இருக்கட்டும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index ae251dc..867af7f 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"చిన్నది"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"మీ స్క్రీన్ మూలన ఒక చిన్న గడియారం కనిపిస్తుంది"</string>
<string name="grid_title" msgid="1688173478777254123">"యాప్ గ్రిడ్"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"యాప్ షేప్ & లేఅవుట్"</string>
+ <string name="grid_layout" msgid="370175667652663686">"లేఅవుట్"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"వర్తింపజేయి"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ఎడిట్ చేయడానికి నొక్కండి"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ప్రస్తుత వాల్పేపర్ను అలాగే ఉంచండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 35dcf7f..6096986 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"เล็ก"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"นาฬิกาขนาดเล็กจะแสดงที่มุมของหน้าจอ"</string>
<string name="grid_title" msgid="1688173478777254123">"ตารางกริดแอป"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"รูปร่างและเลย์เอาต์แอป"</string>
+ <string name="grid_layout" msgid="370175667652663686">"เลย์เอาต์"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"ใช้"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"แตะเพื่อแก้ไข"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"ใช้วอลเปเปอร์ปัจจุบัน"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index af22a07..bf0b106 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Maliit"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"May makikitang maliit na orasan sa sulok ng iyong screen"</string>
<string name="grid_title" msgid="1688173478777254123">"Grid ng app"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Shape ng app at layout"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Layout"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ilapat"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"I-tap para ma-edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Gamitin ang kasalukuyang wallpaper"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 12a4169..dba8272 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Küçük"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Ekranınızın köşesinde küçük bir saat görünür"</string>
<string name="grid_title" msgid="1688173478777254123">"Uygulama tablosu"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Uygulama şekli ve düzeni"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Düzen"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Uygula"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Düzenlemek için dokunun"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Geçerli duvar kağıdını sakla"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7c3cf10..630ee7b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Малий"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"У куті екрана відображається маленький годинник"</string>
<string name="grid_title" msgid="1688173478777254123">"Сітка додатків"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Форма й макет додатка"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Макет"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Застосувати"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Торкніться, щоб змінити"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Зберегти поточний фоновий малюнок"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a39d8d8..aa7e105 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"چھوٹا"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"آپ کی اسکرین کے کونے میں ایک چھوٹی گھڑی دکھائی دیتی ہے"</string>
<string name="grid_title" msgid="1688173478777254123">"ایپ گرڈ"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"ایپ شیپ و لے آؤٹ"</string>
+ <string name="grid_layout" msgid="370175667652663686">"لے آؤٹ"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"لاگو کریں"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ترمیم کرنے کے لیے تھپتھپائيں"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"حالیہ وال پیپر رکھیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 3b2fae8..2552c9a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Kichik"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Ekran chekkasida kichik soat chiqishi"</string>
<string name="grid_title" msgid="1688173478777254123">"Ilovalar jadvali"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Ilova shakli va maketi"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Maket"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tatbiq etish"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tahrirlash uchun tegining"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Joriy fon rasmini saqlab qolish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 58e4ec3..1af19be 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Nhỏ"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Một chiếc đồng hồ nhỏ hiển thị ở góc màn hình"</string>
<string name="grid_title" msgid="1688173478777254123">"Lưới ứng dụng"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Hình dạng ứng dụng và bố cục"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Bố cục"</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>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Giữ hình nền hiện tại"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1192a21..1fdb149 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"一个小型时钟显示在界面一角"</string>
<string name="grid_title" msgid="1688173478777254123">"应用网格"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"应用形状和布局"</string>
+ <string name="grid_layout" msgid="370175667652663686">"布局"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"应用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"点按即可修改"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"保留当前壁纸"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b5fd864..4223a4e 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"在螢幕角落顯示小時鐘"</string>
<string name="grid_title" msgid="1688173478777254123">"應用程式網格"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"應用程式形狀與版面配置"</string>
+ <string name="grid_layout" msgid="370175667652663686">"版面配置"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"套用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"輕按即可編輯"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"保留目前桌布"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 26c9986..e8920a9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"小"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"在畫面角落顯示小型時鐘"</string>
<string name="grid_title" msgid="1688173478777254123">"應用程式排列顯示"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"應用程式的形狀和版面配置"</string>
+ <string name="grid_layout" msgid="370175667652663686">"版面配置"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"套用"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"輕觸這裡即可編輯"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"繼續使用目前的桌布"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9a4d936..7fad926 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -44,10 +44,8 @@
<string name="clock_size_small" msgid="2280449912094164133">"Esincane"</string>
<string name="clock_size_small_description" msgid="4089511196955732480">"Iwashi elincane livela ekhoneni lesikrini sakho"</string>
<string name="grid_title" msgid="1688173478777254123">"Igridi ye-app"</string>
- <!-- no translation found for shape_and_grid_title (9092477491363761054) -->
- <skip />
- <!-- no translation found for grid_layout (370175667652663686) -->
- <skip />
+ <string name="shape_and_grid_title" msgid="9092477491363761054">"Umumo we-app nesakhiwo"</string>
+ <string name="grid_layout" msgid="370175667652663686">"Isakhiwo"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Faka"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Thepha ukuze uhlele"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Gcina isithombe sangemuva samanje"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 07b2800..5643351 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,7 +101,7 @@
<string name="grid_title">App grid</string>
<!-- Title of a section of the customization picker where the user can select app shapes and
- grid layouts for the home screen. [CHAR LIMIT=15] -->
+ grid layouts for the home screen. [CHAR LIMIT=32] -->
<string name="shape_and_grid_title">App shape & layout</string>
<!-- Tab title that switch to app grid customization section, where people can customization
diff --git a/src/com/android/customization/model/color/ColorOption.java b/src/com/android/customization/model/color/ColorOption.java
index d3886a0..18414a4 100644
--- a/src/com/android/customization/model/color/ColorOption.java
+++ b/src/com/android/customization/model/color/ColorOption.java
@@ -19,10 +19,10 @@
import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SYSTEM_PALETTE;
import android.content.Context;
-import android.graphics.Color;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.ColorInt;
import androidx.annotation.VisibleForTesting;
import com.android.customization.model.CustomizationManager;
@@ -59,11 +59,13 @@
private final Style mStyle;
private final int mIndex;
private CharSequence mContentDescription;
+ private final @ColorInt int mSeedColor;
protected ColorOption(String title, Map<String, String> overlayPackages, boolean isDefault,
- Style style, int index) {
+ int seedColor, Style style, int index) {
mTitle = title;
mIsDefault = isDefault;
+ mSeedColor = seedColor;
mStyle = style;
mIndex = index;
mPackagesByCategory = Collections.unmodifiableMap(removeNullValues(overlayPackages));
@@ -102,37 +104,8 @@
}
}
- /**
- * Gets the seed color from the overlay packages in hex string.
- *
- * @return a string representing the seed color, or null if the color option is generated from
- * the default seed.
- */
- public Integer getSeedColor() {
- String seedColor = mPackagesByCategory.get(OVERLAY_CATEGORY_SYSTEM_PALETTE);
- if (TextUtils.isEmpty(seedColor)) {
- return null;
- }
- if (!seedColor.startsWith("#")) {
- seedColor = "#" + seedColor;
- }
- return Color.parseColor(seedColor);
- }
-
- /**
- * Gets the seed color from the overlay packages for logging.
- *
- * @return an int representing the seed color, or NULL_SEED_COLOR
- */
- public int getSeedColorForLogging() {
- String seedColor = mPackagesByCategory.get(OVERLAY_CATEGORY_SYSTEM_PALETTE);
- if (seedColor == null || seedColor.isEmpty()) {
- return ThemesUserEventLogger.NULL_SEED_COLOR;
- }
- if (!seedColor.startsWith("#")) {
- seedColor = "#" + seedColor;
- }
- return Color.parseColor(seedColor);
+ public @ColorInt int getSeedColor() {
+ return mSeedColor;
}
/**
diff --git a/src/com/android/customization/model/color/ColorOptionImpl.kt b/src/com/android/customization/model/color/ColorOptionImpl.kt
index ecef2a7..3b8fbc8 100644
--- a/src/com/android/customization/model/color/ColorOptionImpl.kt
+++ b/src/com/android/customization/model/color/ColorOptionImpl.kt
@@ -33,16 +33,15 @@
overlayPackages: Map<String, String?>,
isDefault: Boolean,
private val source: String?,
+ seedColor: Int,
style: Style,
index: Int,
private val previewInfo: PreviewInfo,
val type: ColorType,
-) : ColorOption(title, overlayPackages, isDefault, style, index) {
+) : ColorOption(title, overlayPackages, isDefault, seedColor, style, index) {
- class PreviewInfo(
- @ColorInt val lightColors: IntArray,
- @ColorInt val darkColors: IntArray,
- ) : ColorOption.PreviewInfo {
+ class PreviewInfo(@ColorInt val lightColors: IntArray, @ColorInt val darkColors: IntArray) :
+ ColorOption.PreviewInfo {
@ColorInt
fun resolveColors(darkTheme: Boolean): IntArray {
return if (darkTheme) darkColors else lightColors
@@ -89,6 +88,7 @@
@ColorSource var source: String? = null
var isDefault = false
+ @ColorInt var seedColor = 0
var style = Style.TONAL_SPOT
var index = 0
var packages: MutableMap<String, String?> = HashMap()
@@ -100,10 +100,11 @@
packages,
isDefault,
source,
+ seedColor,
style,
index,
createPreviewInfo(),
- type
+ type,
)
}
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index 2d7037e..b883e03 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -100,10 +100,7 @@
this.homeWallpaperColors != homeWallpaperColors ||
this.lockWallpaperColors != lockWallpaperColors
if (wallpaperColorsChanged || reload) {
- loadSeedColors(
- homeWallpaperColors,
- lockWallpaperColors,
- )
+ loadSeedColors(homeWallpaperColors, lockWallpaperColors)
this.homeWallpaperColors = homeWallpaperColors
this.lockWallpaperColors = lockWallpaperColors
}
@@ -166,13 +163,7 @@
bundles,
)
} else {
- buildColorSeeds(
- homeWallpaperColors,
- colorsPerSource,
- COLOR_SOURCE_HOME,
- true,
- bundles,
- )
+ buildColorSeeds(homeWallpaperColors, colorsPerSource, COLOR_SOURCE_HOME, true, bundles)
}
wallpaperColorBundles = bundles
}
@@ -206,9 +197,10 @@
val builder = ColorOptionImpl.Builder()
builder.lightColors = getLightColorPreview(lightColorScheme)
builder.darkColors = getDarkColorPreview(darkColorScheme)
+ builder.seedColor = colorInt
builder.addOverlayPackage(
OVERLAY_CATEGORY_SYSTEM_PALETTE,
- if (isDefault) "" else toColorString(colorInt)
+ if (isDefault) "" else toColorString(colorInt),
)
builder.title =
when (style) {
@@ -312,12 +304,7 @@
Style.RAINBOW -> intArrayOf(colorScheme.accent1.s200, colorScheme.accent1.s200)
else -> intArrayOf(colorScheme.accent1.s100, colorScheme.accent1.s100)
}
- return intArrayOf(
- colors[0],
- colors[1],
- colors[0],
- colors[1],
- )
+ return intArrayOf(colors[0], colors[1], colors[0], colors[1])
}
private suspend fun loadPreset() =
@@ -392,6 +379,7 @@
val darkColor = darkColorScheme.accentColor
var lightColors = intArrayOf(lightColor, lightColor, lightColor, lightColor)
var darkColors = intArrayOf(darkColor, darkColor, darkColor, darkColor)
+ builder.seedColor = colorFromStub
builder.addOverlayPackage(OVERLAY_CATEGORY_COLOR, toColorString(colorFromStub))
builder.addOverlayPackage(OVERLAY_CATEGORY_SYSTEM_PALETTE, toColorString(colorFromStub))
if (style != null) {
@@ -426,7 +414,7 @@
if (wallpaperColors.isNotEmpty()) {
wallpaperColors.add(
1,
- buildPreset(it, -1, Style.MONOCHROMATIC, ColorType.WALLPAPER_COLOR)
+ buildPreset(it, -1, Style.MONOCHROMATIC, ColorType.WALLPAPER_COLOR),
)
}
}
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt b/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt
index 652ffdd..15d9088 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt
@@ -19,6 +19,7 @@
import android.content.ComponentName
import android.content.Context
import android.view.LayoutInflater
+import com.android.systemui.Flags
import com.android.systemui.plugins.Plugin
import com.android.systemui.plugins.PluginManager
import com.android.systemui.shared.clocks.ClockRegistry
@@ -52,7 +53,12 @@
backgroundDispatcher,
isEnabled = true,
handleAllUsers = false,
- DefaultClockProvider(context, LayoutInflater.from(context), context.resources),
+ DefaultClockProvider(
+ ctx = context,
+ layoutInflater = LayoutInflater.from(context),
+ resources = context.resources,
+ isClockReactiveVariantsEnabled = Flags.clockReactiveVariants(),
+ ),
keepAllLoaded = true,
subTag = "Picker",
)
diff --git a/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt b/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt
index f35d934..3f120ce 100644
--- a/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt
+++ b/src/com/android/customization/picker/color/data/repository/FakeColorPickerRepository.kt
@@ -22,6 +22,7 @@
import com.android.customization.model.ResourceConstants
import com.android.customization.model.color.ColorOptionImpl
import com.android.customization.model.color.ColorOptionsProvider
+import com.android.customization.model.color.ColorUtils.toColorString
import com.android.customization.picker.color.shared.model.ColorOptionModel
import com.android.customization.picker.color.shared.model.ColorType
import com.android.systemui.monet.Style
@@ -40,7 +41,7 @@
MutableStateFlow(
mapOf<ColorType, List<ColorOptionModel>>(
ColorType.WALLPAPER_COLOR to listOf(),
- ColorType.PRESET_COLOR to listOf()
+ ColorType.PRESET_COLOR to listOf(),
)
)
override val colorOptions: StateFlow<Map<ColorType, List<ColorOptionModel>>> =
@@ -54,7 +55,7 @@
wallpaperOptions: List<ColorOptionImpl>,
presetOptions: List<ColorOptionImpl>,
selectedColorOptionType: ColorType,
- selectedColorOptionIndex: Int
+ selectedColorOptionIndex: Int,
) {
_colorOptions.value =
mapOf(
@@ -68,7 +69,7 @@
ColorOptionModel(
key = "${ColorType.WALLPAPER_COLOR}::$index",
colorOption = colorOption,
- isSelected = isSelected
+ isSelected = isSelected,
)
if (isSelected) {
selectedColorOption = colorOptionModel
@@ -86,7 +87,7 @@
ColorOptionModel(
key = "${ColorType.PRESET_COLOR}::$index",
colorOption = colorOption,
- isSelected = isSelected
+ isSelected = isSelected,
)
if (isSelected) {
selectedColorOption = colorOptionModel
@@ -101,7 +102,7 @@
numWallpaperOptions: Int,
numPresetOptions: Int,
selectedColorOptionType: ColorType,
- selectedColorOptionIndex: Int
+ selectedColorOptionIndex: Int,
) {
_colorOptions.value =
mapOf(
@@ -140,7 +141,7 @@
}
add(colorOption)
}
- }
+ },
)
}
@@ -160,7 +161,7 @@
return builder.build()
}
- fun buildPresetOption(style: Style, seedColor: String): ColorOptionImpl {
+ fun buildPresetOption(style: Style, seedColor: Int): ColorOptionImpl {
val builder = ColorOptionImpl.Builder()
builder.lightColors =
intArrayOf(Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT)
@@ -170,9 +171,13 @@
builder.source = ColorOptionsProvider.COLOR_SOURCE_PRESET
builder.style = style
builder.title = "Preset"
+ builder.seedColor = seedColor
builder
.addOverlayPackage("TEST_PACKAGE_TYPE", "preset_color")
- .addOverlayPackage(ResourceConstants.OVERLAY_CATEGORY_SYSTEM_PALETTE, seedColor)
+ .addOverlayPackage(
+ ResourceConstants.OVERLAY_CATEGORY_SYSTEM_PALETTE,
+ toColorString(seedColor),
+ )
return builder.build()
}
@@ -192,7 +197,7 @@
return builder.build()
}
- fun buildWallpaperOption(source: String, style: Style, seedColor: String): ColorOptionImpl {
+ fun buildWallpaperOption(source: String, style: Style, seedColor: Int): ColorOptionImpl {
val builder = ColorOptionImpl.Builder()
builder.lightColors =
intArrayOf(Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT)
@@ -202,9 +207,13 @@
builder.source = source
builder.style = style
builder.title = "Dynamic"
+ builder.seedColor = seedColor
builder
.addOverlayPackage("TEST_PACKAGE_TYPE", "wallpaper_color")
- .addOverlayPackage(ResourceConstants.OVERLAY_CATEGORY_SYSTEM_PALETTE, seedColor)
+ .addOverlayPackage(
+ ResourceConstants.OVERLAY_CATEGORY_SYSTEM_PALETTE,
+ toColorString(seedColor),
+ )
return builder.build()
}
@@ -237,7 +246,7 @@
_colorOptions.value =
mapOf(
ColorType.WALLPAPER_COLOR to newWallpaperColorOptions,
- ColorType.PRESET_COLOR to newBasicColorOptions
+ ColorType.PRESET_COLOR to newBasicColorOptions,
)
}
diff --git a/src/com/android/customization/picker/color/domain/interactor/ColorPickerInteractor.kt b/src/com/android/customization/picker/color/domain/interactor/ColorPickerInteractor.kt
index aebc6c2..4f779f8 100644
--- a/src/com/android/customization/picker/color/domain/interactor/ColorPickerInteractor.kt
+++ b/src/com/android/customization/picker/color/domain/interactor/ColorPickerInteractor.kt
@@ -60,6 +60,4 @@
_selectingColorOption.value = null
}
}
-
- fun getCurrentColorOption(): ColorOptionModel = repository.getCurrentColorOption()
}
diff --git a/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt b/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt
index 61a648f..9dba4bb 100644
--- a/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt
+++ b/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt
@@ -49,10 +49,9 @@
/** View-models for each color tab. */
val colorTypeTabs: Flow<Map<ColorType, ColorTypeTabViewModel>> =
- combine(
- interactor.colorOptions,
- selectedColorTypeTabId,
- ) { colorOptions, selectedColorTypeIdOrNull ->
+ combine(interactor.colorOptions, selectedColorTypeTabId) {
+ colorOptions,
+ selectedColorTypeIdOrNull ->
colorOptions.keys
.mapIndexed { index, colorType ->
val isSelected =
@@ -143,8 +142,7 @@
.sourceForLogging,
colorOptionModel.colorOption
.styleForLogging,
- colorOptionModel.colorOption
- .seedColorForLogging,
+ colorOptionModel.colorOption.seedColor,
)
}
}
@@ -180,7 +178,7 @@
min(
max(0, COLOR_SECTION_OPTION_SIZE - wallpaperOptions.size),
presetOptions.size,
- )
+ ),
)
subOptions + additionalSubOptions
}
@@ -192,11 +190,7 @@
) : ViewModelProvider.Factory {
override fun <T : ViewModel> create(modelClass: Class<T>): T {
@Suppress("UNCHECKED_CAST")
- return ColorPickerViewModel(
- context = context,
- interactor = interactor,
- logger = logger,
- )
+ return ColorPickerViewModel(context = context, interactor = interactor, logger = logger)
as T
}
}
diff --git a/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
index e2a8cf3..10bedb3 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
@@ -92,6 +92,17 @@
}
}
}
+
+ launch {
+ viewModel.previewingColorOption.collect { colorModel ->
+ if (colorModel != null) {
+ colorUpdateViewModel.previewColors(
+ colorModel.colorOption.seedColor,
+ colorModel.colorOption.style,
+ )
+ } else colorUpdateViewModel.resetPreview()
+ }
+ }
}
}
}
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2.kt
index fc78ac7..26e7867 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2.kt
@@ -176,7 +176,7 @@
logger.logThemeColorApplied(
previewingColorOption.colorOption.sourceForLogging,
previewingColorOption.colorOption.styleForLogging,
- previewingColorOption.colorOption.seedColorForLogging,
+ previewingColorOption.colorOption.seedColor,
)
}
}
diff --git a/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt b/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt
index fd82710..0dc38e8 100644
--- a/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt
+++ b/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt
@@ -24,9 +24,7 @@
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
-import com.android.customization.model.color.ColorOptionsProvider
import com.android.customization.picker.color.data.util.MaterialColorsGenerator
-import com.android.systemui.monet.ColorScheme
import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END
import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START
import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.KEY_INITIALLY_SELECTED_SLOT_ID
@@ -153,10 +151,7 @@
workspaceCallback.sendMessage(MESSAGE_ID_UPDATE_COLOR, Bundle())
return@collect
}
- val seedColor =
- it.colorOption.seedColor
- ?: getSeedColorFromSource(it.colorOption.source)
- ?: return@collect
+ val seedColor = it.colorOption.seedColor
val (ids, colors) =
materialColorsGenerator.generate(
seedColor,
@@ -176,16 +171,6 @@
}
}
- private fun getSeedColorFromSource(source: String?): Int? {
- return when (source) {
- ColorOptionsProvider.COLOR_SOURCE_HOME -> WallpaperManager.FLAG_SYSTEM
- ColorOptionsProvider.COLOR_SOURCE_LOCK -> WallpaperManager.FLAG_LOCK
- else -> null
- }
- ?.let { wallpaperManager.getWallpaperColors(it) }
- ?.let { ColorScheme.getSeedColor(it) }
- }
-
companion object {
const val MESSAGE_ID_UPDATE_GRID = 7414
const val KEY_GRID_NAME = "grid_name"
diff --git a/tests/robotests/src/com/android/customization/model/color/ColorCustomizationManagerTest.kt b/tests/robotests/src/com/android/customization/model/color/ColorCustomizationManagerTest.kt
index 0776cc8..98a1973 100644
--- a/tests/robotests/src/com/android/customization/model/color/ColorCustomizationManagerTest.kt
+++ b/tests/robotests/src/com/android/customization/model/color/ColorCustomizationManagerTest.kt
@@ -64,7 +64,7 @@
provider,
application.contentResolver,
mockOM,
- MoreExecutors.newDirectExecutorService()
+ MoreExecutors.newDirectExecutorService(),
)
}
@@ -80,7 +80,7 @@
OVERLAY_CATEGORY_COLOR to someOtherColor,
OVERLAY_COLOR_SOURCE to source,
OVERLAY_THEME_STYLE to style.toString(),
- ColorOption.TIMESTAMP_FIELD to "12345"
+ ColorOption.TIMESTAMP_FIELD to "12345",
)
val json = JSONObject(settings).toString()
@@ -106,14 +106,16 @@
getPresetColorOption(index),
object : CustomizationManager.Callback {
override fun onSuccess() {}
+
override fun onError(throwable: Throwable?) {}
- }
+ },
)
val overlaysJson = JSONObject(manager.storedOverlays)
assertThat(overlaysJson.getString(OVERLAY_COLOR_INDEX)).isEqualTo(value)
}
+
@Test
fun apply_WallpaperColorOption_index() {
testApplyWallpaperColorOption(1, "1")
@@ -127,8 +129,9 @@
getWallpaperColorOption(index),
object : CustomizationManager.Callback {
override fun onSuccess() {}
+
override fun onError(throwable: Throwable?) {}
- }
+ },
)
val overlaysJson = JSONObject(manager.storedOverlays)
@@ -141,10 +144,11 @@
mapOf("fake_package" to "fake_color"),
/* isDefault= */ false,
COLOR_SOURCE_PRESET,
+ 12345,
Style.TONAL_SPOT,
index,
ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
- ColorType.PRESET_COLOR
+ ColorType.PRESET_COLOR,
)
}
@@ -154,10 +158,11 @@
mapOf("fake_package" to "fake_color"),
/* isDefault= */ false,
COLOR_SOURCE_HOME,
+ 12345,
Style.TONAL_SPOT,
index,
ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
- ColorType.WALLPAPER_COLOR
+ ColorType.WALLPAPER_COLOR,
)
}
@@ -170,8 +175,9 @@
getWallpaperColorOption(0),
object : CustomizationManager.Callback {
override fun onSuccess() {}
+
override fun onError(throwable: Throwable?) {}
- }
+ },
)
val overlaysJson = JSONObject(manager.storedOverlays)
@@ -188,8 +194,9 @@
getWallpaperColorOption(0),
object : CustomizationManager.Callback {
override fun onSuccess() {}
+
override fun onError(throwable: Throwable?) {}
- }
+ },
)
val overlaysJson = JSONObject(manager.storedOverlays)
diff --git a/tests/robotests/src/com/android/customization/model/color/ColorOptionTest.kt b/tests/robotests/src/com/android/customization/model/color/ColorOptionTest.kt
index b9156d6..ed04d14 100644
--- a/tests/robotests/src/com/android/customization/model/color/ColorOptionTest.kt
+++ b/tests/robotests/src/com/android/customization/model/color/ColorOptionTest.kt
@@ -15,6 +15,7 @@
*/
package com.android.customization.model.color
+import android.graphics.Color
import com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SYSTEM_PALETTE
import com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_HOME
import com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_LOCK
@@ -54,10 +55,11 @@
mapOf("fake_package" to "fake_color"),
false,
source,
+ 12345,
Style.TONAL_SPOT,
/* index= */ 0,
ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
- ColorType.WALLPAPER_COLOR
+ ColorType.WALLPAPER_COLOR,
)
assertThat(colorOption.source).isEqualTo(source)
}
@@ -77,10 +79,11 @@
mapOf("fake_package" to "fake_color"),
/* isDefault= */ false,
"fake_source",
+ 12345,
style,
0,
ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
- ColorType.WALLPAPER_COLOR
+ ColorType.WALLPAPER_COLOR,
)
assertThat(colorOption.style).isEqualTo(style)
}
@@ -100,17 +103,41 @@
mapOf("fake_package" to "fake_color"),
/* isDefault= */ false,
"fake_source",
+ 12345,
Style.TONAL_SPOT,
index,
ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
- ColorType.WALLPAPER_COLOR
+ ColorType.WALLPAPER_COLOR,
)
assertThat(colorOption.index).isEqualTo(index)
}
+ @Test
+ fun colorOption_seedColor() {
+ testColorOptionSeed(Color.RED)
+ testColorOptionSeed(Color.WHITE)
+ testColorOptionSeed(Color.BLACK)
+ }
+
+ private fun testColorOptionSeed(seedColor: Int) {
+ val colorOption: ColorOption =
+ ColorOptionImpl(
+ "fake color",
+ mapOf("fake_package" to "fake_color"),
+ /* isDefault= */ false,
+ "fake_source",
+ seedColor,
+ Style.TONAL_SPOT,
+ 0,
+ ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
+ ColorType.WALLPAPER_COLOR,
+ )
+ assertThat(colorOption.seedColor).isEqualTo(seedColor)
+ }
+
private fun setUpWallpaperColorOption(
isDefault: Boolean,
- source: String = "some_source"
+ source: String = "some_source",
): ColorOptionImpl {
val overlays =
if (isDefault) {
@@ -124,10 +151,11 @@
overlays,
isDefault,
source,
+ 12345,
Style.TONAL_SPOT,
/* index= */ 0,
ColorOptionImpl.PreviewInfo(intArrayOf(0), intArrayOf(0)),
- ColorType.WALLPAPER_COLOR
+ ColorType.WALLPAPER_COLOR,
)
}
diff --git a/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt b/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
index f5878a4..50602ad 100644
--- a/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
@@ -17,7 +17,6 @@
package com.android.customization.model.picker.color.ui.viewmodel
import android.content.Context
-import android.graphics.Color
import android.stats.style.StyleEnums
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
@@ -86,7 +85,7 @@
ColorPickerViewModel.Factory(
context = context,
interactor = interactor,
- logger = logger
+ logger = logger,
)
.create(ColorPickerViewModel::class.java)
@@ -105,19 +104,19 @@
assertColorOptionUiState(
colorOptions = colorSectionOptions(),
- selectedColorOptionIndex = 0
+ selectedColorOptionIndex = 0,
)
selectColorOption(colorSectionOptions, 2)
assertColorOptionUiState(
colorOptions = colorSectionOptions(),
- selectedColorOptionIndex = 2
+ selectedColorOptionIndex = 2,
)
selectColorOption(colorSectionOptions, 4)
assertColorOptionUiState(
colorOptions = colorSectionOptions(),
- selectedColorOptionIndex = 4
+ selectedColorOptionIndex = 4,
)
}
@@ -129,12 +128,12 @@
repository.buildWallpaperOption(
ColorOptionsProvider.COLOR_SOURCE_LOCK,
Style.EXPRESSIVE,
- "121212"
+ 121212,
)
),
- listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
+ listOf(repository.buildPresetOption(Style.FRUIT_SALAD, -54321)),
ColorType.PRESET_COLOR,
- 0
+ 0,
)
val colorTypes = collectLastValue(underTest.colorTypeTabs)
@@ -149,7 +148,7 @@
assertThat(logger.themeColorSource)
.isEqualTo(StyleEnums.COLOR_SOURCE_LOCK_SCREEN_WALLPAPER)
assertThat(logger.themeColorStyle).isEqualTo(Style.EXPRESSIVE.toString().hashCode())
- assertThat(logger.themeSeedColor).isEqualTo(Color.parseColor("#121212"))
+ assertThat(logger.themeSeedColor).isEqualTo(121212)
}
@Test
@@ -160,12 +159,12 @@
repository.buildWallpaperOption(
ColorOptionsProvider.COLOR_SOURCE_LOCK,
Style.EXPRESSIVE,
- "121212"
+ 121212,
)
),
- listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
+ listOf(repository.buildPresetOption(Style.FRUIT_SALAD, -54321)),
ColorType.WALLPAPER_COLOR,
- 0
+ 0,
)
val colorTypes = collectLastValue(underTest.colorTypeTabs)
@@ -179,7 +178,7 @@
assertThat(logger.themeColorSource).isEqualTo(StyleEnums.COLOR_SOURCE_PRESET_COLOR)
assertThat(logger.themeColorStyle).isEqualTo(Style.FRUIT_SALAD.toString().hashCode())
- assertThat(logger.themeSeedColor).isEqualTo(Color.parseColor("#ABCDEF"))
+ assertThat(logger.themeSeedColor).isEqualTo(-54321)
}
@Test
@@ -193,7 +192,7 @@
colorTypes = colorTypes(),
colorOptions = colorOptions(),
selectedColorTypeText = "Wallpaper colors",
- selectedColorOptionIndex = 0
+ selectedColorOptionIndex = 0,
)
// Select "Basic colors" tab
@@ -202,7 +201,7 @@
colorTypes = colorTypes(),
colorOptions = colorOptions(),
selectedColorTypeText = "Basic colors",
- selectedColorOptionIndex = -1
+ selectedColorOptionIndex = -1,
)
// Select a color option
@@ -214,7 +213,7 @@
colorTypes = colorTypes(),
colorOptions = colorOptions(),
selectedColorTypeText = "Wallpaper colors",
- selectedColorOptionIndex = -1
+ selectedColorOptionIndex = -1,
)
// Check new option is selected
@@ -223,7 +222,7 @@
colorTypes = colorTypes(),
colorOptions = colorOptions(),
selectedColorTypeText = "Basic colors",
- selectedColorOptionIndex = 2
+ selectedColorOptionIndex = 2,
)
}
diff --git a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2Test.kt b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2Test.kt
index c153de6..a4d0ba0 100644
--- a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2Test.kt
+++ b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ColorPickerViewModel2Test.kt
@@ -17,7 +17,6 @@
package com.android.wallpaper.customization.ui.viewmodel
import android.content.Context
-import android.graphics.Color
import android.stats.style.StyleEnums
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
@@ -104,10 +103,10 @@
repository.buildWallpaperOption(
ColorOptionsProvider.COLOR_SOURCE_LOCK,
Style.EXPRESSIVE,
- "121212",
+ 121212,
)
),
- listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
+ listOf(repository.buildPresetOption(Style.FRUIT_SALAD, -54321)),
ColorType.PRESET_COLOR,
0,
)
@@ -125,7 +124,7 @@
assertThat(logger.themeColorSource)
.isEqualTo(StyleEnums.COLOR_SOURCE_LOCK_SCREEN_WALLPAPER)
assertThat(logger.themeColorStyle).isEqualTo(Style.EXPRESSIVE.toString().hashCode())
- assertThat(logger.themeSeedColor).isEqualTo(Color.parseColor("#121212"))
+ assertThat(logger.themeSeedColor).isEqualTo(121212)
}
@Test
@@ -136,10 +135,10 @@
repository.buildWallpaperOption(
ColorOptionsProvider.COLOR_SOURCE_LOCK,
Style.EXPRESSIVE,
- "121212",
+ 121212,
)
),
- listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
+ listOf(repository.buildPresetOption(Style.FRUIT_SALAD, -54321)),
ColorType.WALLPAPER_COLOR,
0,
)
@@ -156,7 +155,7 @@
assertThat(logger.themeColorSource).isEqualTo(StyleEnums.COLOR_SOURCE_PRESET_COLOR)
assertThat(logger.themeColorStyle).isEqualTo(Style.FRUIT_SALAD.toString().hashCode())
- assertThat(logger.themeSeedColor).isEqualTo(Color.parseColor("#ABCDEF"))
+ assertThat(logger.themeSeedColor).isEqualTo(-54321)
}
@Test