Merging from ub-launcher3-rvc-qpr-dev @ build 6861538

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6861538.html

Change-Id: I1a17e523b95cf28220c9a6a4114d2019dda5545d
diff --git a/Android.mk b/Android.mk
index a0d05cb..987c875 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,11 +28,10 @@
 LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
 LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd SystemUISharedLib
 LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_SDK_VERSION := system_current
 
 LOCAL_PACKAGE_NAME := ThemePicker
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRODUCT_MODULE := true
+LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := WallpaperPicker2
 
 ifneq (,$(wildcard frameworks/base))
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..61e252c
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,52 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-apps/ThemePicker)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-apps/ThemePicker)
\ No newline at end of file
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0ad3147..8c16637 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -35,7 +35,7 @@
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutno je primenjeno i pregleda se"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutno se pregleda"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, ikone: <xliff:g id="ID_2">%2$s</xliff:g>, oblik: <xliff:g id="ID_3">%3$s</xliff:g>, boja: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
-    <string name="default_theme_title" msgid="2555741736622366797">"Podrazum."</string>
+    <string name="default_theme_title" msgid="2555741736622366797">"Podrazumevano"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
     <string name="preview_name_icon" msgid="6818927315316316440">"Ikona"</string>
     <string name="preview_name_color" msgid="8776203144994416172">"Boja"</string>
@@ -45,9 +45,9 @@
     <string name="font_card_body" msgid="6790525594503904468">"Dodajte omiljene fontove na svaki ekran"</string>
     <string name="grid_options_title" msgid="7071930966989877023">"Odaberite veličinu mreže"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
-    <string name="applied_theme_msg" msgid="3749018706366796244">"Podešavanje stila je uspelo"</string>
+    <string name="applied_theme_msg" msgid="3749018706366796244">"Stil je podešen"</string>
     <string name="applied_clock_msg" msgid="1303338016701443767">"Podešavanje sata je uspelo"</string>
-    <string name="applied_grid_msg" msgid="3250499654436933034">"Podešavanje mreže je uspelo"</string>
+    <string name="applied_grid_msg" msgid="3250499654436933034">"Mreža je podešena"</string>
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Došlo je do problema pri primeni stila"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Dalje"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Prethodno"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 43debfc..e4c997f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -65,9 +65,9 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Выдаліць"</string>
     <string name="cancel" msgid="4651030493668562067">"Скасаваць"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Задаць шпалеры"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"Выкарыстоўваць <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Выбраныя кампаненты супадаюць са стылем пад назвай <xliff:g id="ID_1">%1$s</xliff:g>. Ці хочаце вы выкарыстоўваць <xliff:g id="ID_2">%1$s</xliff:g>?"</string>
-    <string name="use_style_button" msgid="1754493078383627019">"Выкарыстоўваць <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"Выкарыстоўваць стыль \"<xliff:g id="ID_1">%1$s</xliff:g>\"?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Выбраныя кампаненты адпавядаюць стылю \"<xliff:g id="ID_1">%1$s</xliff:g>\". Выкарыстоўваць стыль \"<xliff:g id="ID_2">%1$s</xliff:g>\"?"</string>
+    <string name="use_style_button" msgid="1754493078383627019">"Выкарыстоўваць \"<xliff:g id="ID_1">%1$s</xliff:g>\""</string>
     <string name="no_thanks" msgid="7286616980115687627">"Не, дзякуй"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Папярэдні прагляд гадзінніка <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"Памылка! Нешта пайшло не так."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 18d2ef4..52a2d78 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -43,7 +43,7 @@
     <string name="preview_name_wallpaper" msgid="1738652462949531828">"Fons de pantalla"</string>
     <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>
     <string name="font_card_body" msgid="6790525594503904468">"Afegeix els teus tipus de lletra preferits a cada pantalla"</string>
-    <string name="grid_options_title" msgid="7071930966989877023">"Tria la mida de la quadrícula"</string>
+    <string name="grid_options_title" msgid="7071930966989877023">"Tria una mida de quadrícula"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <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>
@@ -65,9 +65,9 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Suprimeix"</string>
     <string name="cancel" msgid="4651030493668562067">"Cancel·la"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Estableix el fons de pantalla temàtic"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"Vols utilitzar l\'estil <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Els components que has triat corresponen a l\'estil <xliff:g id="ID_1">%1$s</xliff:g>. Vols utilitzar l\'estil <xliff:g id="ID_2">%1$s</xliff:g>?"</string>
-    <string name="use_style_button" msgid="1754493078383627019">"Utilitza l\'estil <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"Prefereixes utilitzar <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Els components que has triat corresponen a l\'estil <xliff:g id="ID_1">%1$s</xliff:g>. Prefereixes utilitzar <xliff:g id="ID_2">%1$s</xliff:g>?"</string>
+    <string name="use_style_button" msgid="1754493078383627019">"Utilitza <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No, gràcies"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Previsualització de rellotge <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"Vaja! S\'ha produït un error."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4b75f12..0160325 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -35,7 +35,7 @@
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (opción aplicada y vista previa en curso)"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (vista previa en curso)"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fuente: <xliff:g id="ID_1">%1$s</xliff:g>; iconos: <xliff:g id="ID_2">%2$s</xliff:g>; forma: <xliff:g id="ID_3">%3$s</xliff:g>; color: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
-    <string name="default_theme_title" msgid="2555741736622366797">"Predeterm."</string>
+    <string name="default_theme_title" msgid="2555741736622366797">"Predeterminado"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fuente"</string>
     <string name="preview_name_icon" msgid="6818927315316316440">"Icono"</string>
     <string name="preview_name_color" msgid="8776203144994416172">"Color"</string>
@@ -43,11 +43,11 @@
     <string name="preview_name_wallpaper" msgid="1738652462949531828">"Fondo de pantalla"</string>
     <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>
     <string name="font_card_body" msgid="6790525594503904468">"Añade tus fuentes favoritas a cada pantalla"</string>
-    <string name="grid_options_title" msgid="7071930966989877023">"Seleccionar tamaño de cuadrícula"</string>
+    <string name="grid_options_title" msgid="7071930966989877023">"Elige un tamaño de cuadrícula"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
-    <string name="applied_theme_msg" msgid="3749018706366796244">"Estilo implementado correctamente"</string>
+    <string name="applied_theme_msg" msgid="3749018706366796244">"Estilo aplicado correctamente"</string>
     <string name="applied_clock_msg" msgid="1303338016701443767">"Reloj puesto correctamente"</string>
-    <string name="applied_grid_msg" msgid="3250499654436933034">"Cuadrícula definida correctamente"</string>
+    <string name="applied_grid_msg" msgid="3250499654436933034">"Cuadrícula configurada correctamente"</string>
     <string name="apply_theme_error_msg" msgid="791364062636538317">"No se ha podido aplicar el estilo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Siguiente"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
@@ -65,9 +65,9 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Eliminar"</string>
     <string name="cancel" msgid="4651030493668562067">"Cancelar"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Definir fondo de pantalla del estilo"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"¿Quieres usar <xliff:g id="ID_1">%1$s</xliff:g> en su lugar?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Los características que has elegido coinciden con el estilo de <xliff:g id="ID_1">%1$s</xliff:g>. ¿Quieres usar <xliff:g id="ID_2">%1$s</xliff:g> en su lugar?"</string>
-    <string name="use_style_button" msgid="1754493078383627019">"Utilizar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"¿Quieres usar <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Los características que has elegido coinciden con el estilo <xliff:g id="ID_1">%1$s</xliff:g>. ¿Quieres usar <xliff:g id="ID_2">%1$s</xliff:g> en su lugar?"</string>
+    <string name="use_style_button" msgid="1754493078383627019">"Usar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No, gracias"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Vista previa del reloj <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"¡Vaya! Se ha producido un error."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c2a5048..c2e40e8 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -65,9 +65,9 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Kustuta"</string>
     <string name="cancel" msgid="4651030493668562067">"Tühista"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Määrake stiili taustapilt"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"Kas kasutada hoopis teemat <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Valitud komponendid ühtivad stiiliga <xliff:g id="ID_1">%1$s</xliff:g>. Kas soovite selle asemel kasutada teemat <xliff:g id="ID_2">%1$s</xliff:g>?"</string>
-    <string name="use_style_button" msgid="1754493078383627019">"Kasuta teemat <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"Kas kasutada hoopis stiili <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Valitud komponendid ühtivad stiiliga <xliff:g id="ID_1">%1$s</xliff:g>. Kas soovite selle asemel kasutada stiili <xliff:g id="ID_2">%1$s</xliff:g>?"</string>
+    <string name="use_style_button" msgid="1754493078383627019">"Kasuta stiili <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Tänan, ei"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Kella <xliff:g id="ID_1">%1$s</xliff:g> eelvaade"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"Vabandust! Midagi läks valesti."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 043f016..56bd374 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -72,5 +72,5 @@
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ઘડિયાળનું પ્રીવ્યૂ"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"અરેરે! કંઈક ખોટું થયું."</string>
     <string name="theme_preview_icons_section_title" msgid="7064768910744000643">"રંગ / આઇકન"</string>
-    <string name="style_info_description" msgid="2612473574431003251">"ફોન્ટ, આઇકન, ઍપના આકાર અને રંગનો પ્રીવ્યૂ"</string>
+    <string name="style_info_description" msgid="2612473574431003251">"ફૉન્ટ, આઇકન, ઍપના આકાર અને રંગનો પ્રીવ્યૂ"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7cec3d6..febd9c2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -66,7 +66,7 @@
     <string name="cancel" msgid="4651030493668562067">"रद्द करें"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"स्टाइल वॉलपेपर सेट करें"</string>
     <string name="use_style_instead_title" msgid="1578754995763917502">"इसके बजाय <xliff:g id="ID_1">%1$s</xliff:g> का इस्तेमाल करें?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"आपने जो घटक चुने हैं वे <xliff:g id="ID_1">%1$s</xliff:g> शैली से मेल खाते हैं. क्या आप इसके बजाय <xliff:g id="ID_2">%1$s</xliff:g> का इस्तेमाल करना चाहते हैं?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"आपने जो कॉम्पोनेंट चुने हैं वे <xliff:g id="ID_1">%1$s</xliff:g> शैली से मेल खाते हैं. क्या आप इसके बजाय <xliff:g id="ID_2">%1$s</xliff:g> का इस्तेमाल करना चाहते हैं?"</string>
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> इस्तेमाल करें"</string>
     <string name="no_thanks" msgid="7286616980115687627">"रहने दें"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> घड़ी की झलक"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0d6340a..38a2a80 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -65,9 +65,9 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"削除"</string>
     <string name="cancel" msgid="4651030493668562067">"キャンセル"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"スタイルの壁紙を設定"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"代わりに <xliff:g id="ID_1">%1$s</xliff:g> を使用しますか?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"選択したコンポーネントは <xliff:g id="ID_1">%1$s</xliff:g> スタイルに適合します。代わりに <xliff:g id="ID_2">%1$s</xliff:g> を使用しますか?"</string>
-    <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> を使用"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"代わりに「<xliff:g id="ID_1">%1$s</xliff:g>」を使用しますか?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"選択したコンポーネントは「<xliff:g id="ID_1">%1$s</xliff:g>」スタイルに適合します。代わりに「<xliff:g id="ID_2">%1$s</xliff:g>」を使用しますか?"</string>
+    <string name="use_style_button" msgid="1754493078383627019">"「<xliff:g id="ID_1">%1$s</xliff:g>」を使用"</string>
     <string name="no_thanks" msgid="7286616980115687627">"いいえ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> クロックのプレビュー"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"問題が発生しました。"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 4b552e8..c419b14 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -45,7 +45,7 @@
     <string name="font_card_body" msgid="6790525594503904468">"Жактырган ариптериңизди каалаган экранга коюп алсаңыз болот"</string>
     <string name="grid_options_title" msgid="7071930966989877023">"Торчонун өлчөмүн тандоо"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
-    <string name="applied_theme_msg" msgid="3749018706366796244">"Стили ийгиликтүү орнотулду"</string>
+    <string name="applied_theme_msg" msgid="3749018706366796244">"Стиль коюлду"</string>
     <string name="applied_clock_msg" msgid="1303338016701443767">"Саат ийгиликтүү жөндөлдү"</string>
     <string name="applied_grid_msg" msgid="3250499654436933034">"Торчо ийгиликтүү жөндөлдү"</string>
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Стилди колдонууда маселе келип чыкты"</string>
@@ -66,7 +66,7 @@
     <string name="cancel" msgid="4651030493668562067">"Жок"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Тушкагаздын стилин жөндөө"</string>
     <string name="use_style_instead_title" msgid="1578754995763917502">"Анын ордуна <xliff:g id="ID_1">%1$s</xliff:g> колдонулсунбу?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Сиз тандаган компонеттер <xliff:g id="ID_1">%1$s</xliff:g> стилине туура келет. Анын ордуна <xliff:g id="ID_2">%1$s</xliff:g> колдонулсунбу?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Сиз тандаган нерселер \"<xliff:g id="ID_1">%1$s</xliff:g>\" стилине туура келет. Ушул стилди <xliff:g id="ID_2">%1$s</xliff:g> колдоно бересизби?"</string>
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> колдонулсун"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Жок, рахмат"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> саатын алдын ала көрүү"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7f48d42..674a844 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -35,7 +35,7 @@
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, тренутно је примењено и прегледа се"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, тренутно се прегледа"</string>
     <string name="theme_description" msgid="3697012391785254635">"Фонт: <xliff:g id="ID_1">%1$s</xliff:g>, иконе: <xliff:g id="ID_2">%2$s</xliff:g>, облик: <xliff:g id="ID_3">%3$s</xliff:g>, боја: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
-    <string name="default_theme_title" msgid="2555741736622366797">"Подразум."</string>
+    <string name="default_theme_title" msgid="2555741736622366797">"Подразумевано"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Фонт"</string>
     <string name="preview_name_icon" msgid="6818927315316316440">"Икона"</string>
     <string name="preview_name_color" msgid="8776203144994416172">"Боја"</string>
@@ -45,9 +45,9 @@
     <string name="font_card_body" msgid="6790525594503904468">"Додајте омиљене фонтове на сваки екран"</string>
     <string name="grid_options_title" msgid="7071930966989877023">"Одаберите величину мреже"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
-    <string name="applied_theme_msg" msgid="3749018706366796244">"Подешавање стила је успело"</string>
+    <string name="applied_theme_msg" msgid="3749018706366796244">"Стил је подешен"</string>
     <string name="applied_clock_msg" msgid="1303338016701443767">"Подешавање сата је успело"</string>
-    <string name="applied_grid_msg" msgid="3250499654436933034">"Подешавање мреже је успело"</string>
+    <string name="applied_grid_msg" msgid="3250499654436933034">"Мрежа је подешена"</string>
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Дошло је до проблема при примени стила"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Даље"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Претходно"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bbeec0c..7330214 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -65,8 +65,8 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ลบ"</string>
     <string name="cancel" msgid="4651030493668562067">"ยกเลิก"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"ตั้งค่าวอลเปเปอร์รูปแบบ"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"ใช้ <xliff:g id="ID_1">%1$s</xliff:g> แทนไหม"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"ส่วนประกอบที่คุณเลือกตรงกับรูปแบบ <xliff:g id="ID_1">%1$s</xliff:g> ต้องการใช้ <xliff:g id="ID_2">%1$s</xliff:g> แทนไหม"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"ใช้<xliff:g id="ID_1">%1$s</xliff:g>แทนไหม"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"ส่วนประกอบที่คุณเลือกตรงกับรูปแบบ<xliff:g id="ID_1">%1$s</xliff:g> ต้องการใช้<xliff:g id="ID_2">%1$s</xliff:g>แทนไหม"</string>
     <string name="use_style_button" msgid="1754493078383627019">"ใช้ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ไม่เป็นไร"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"ตัวอย่างนาฬิกา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index be1a87b..62bb5d0 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -43,7 +43,7 @@
     <string name="preview_name_wallpaper" msgid="1738652462949531828">"وال پیپر"</string>
     <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>
     <string name="font_card_body" msgid="6790525594503904468">"ہر اسکرین میں اپنے پسندیدہ فونٹس شامل کریں"</string>
-    <string name="grid_options_title" msgid="7071930966989877023">"ایک گرڈ کی سائز منتخب کریں"</string>
+    <string name="grid_options_title" msgid="7071930966989877023">"گرڈ کا سائز منتخب کریں"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="3749018706366796244">"طرز کامیابی کے ساتھ سیٹ ہو گیا"</string>
     <string name="applied_clock_msg" msgid="1303338016701443767">"گھڑی کامیابی کے ساتھ سیٹ ہو گئی"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 122e472..f86d010 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -20,7 +20,7 @@
     <string name="app_name" msgid="6995669566699638946">"Mavzu va fon rasmlari"</string>
     <string name="theme_title" msgid="2144932106319405101">"Uslub"</string>
     <string name="clock_title" msgid="2126046720254613991">"Soat"</string>
-    <string name="grid_title" msgid="2825094404523390773">"Jadval"</string>
+    <string name="grid_title" msgid="2825094404523390773">"Katak"</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>
@@ -66,7 +66,7 @@
     <string name="cancel" msgid="4651030493668562067">"Bekor qilish"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Fon rasmi uslubini sozlash"</string>
     <string name="use_style_instead_title" msgid="1578754995763917502">"Oʻrniga <xliff:g id="ID_1">%1$s</xliff:g> ishlatilsinmi?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Siz tanlagan komponentlar <xliff:g id="ID_1">%1$s</xliff:g> stiliga mos. Oʻrniga <xliff:g id="ID_2">%1$s</xliff:g> ishlatilsinmi?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Siz tanlagan komponentlar <xliff:g id="ID_1">%1$s</xliff:g> uslubiga mos. Oʻrniga <xliff:g id="ID_2">%1$s</xliff:g> ishlatilsinmi?"</string>
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> ishlatish"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Kerak emas"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> soatiga razm solish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f5b6fee..9530e08 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -65,9 +65,9 @@
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Xóa"</string>
     <string name="cancel" msgid="4651030493668562067">"Hủy"</string>
     <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Nơi để đặt hình nền"</string>
-    <string name="use_style_instead_title" msgid="1578754995763917502">"Sử dụng <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
-    <string name="use_style_instead_body" msgid="3051937045807471496">"Các thành phần bạn chọn phù hợp với kiểu <xliff:g id="ID_1">%1$s</xliff:g>. Bạn có muốn sử dụng <xliff:g id="ID_2">%1$s</xliff:g> không?"</string>
-    <string name="use_style_button" msgid="1754493078383627019">"Sử dụng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="use_style_instead_title" msgid="1578754995763917502">"Sử dụng kiểu <xliff:g id="ID_1">%1$s</xliff:g>?"</string>
+    <string name="use_style_instead_body" msgid="3051937045807471496">"Các thành phần bạn chọn phù hợp với kiểu <xliff:g id="ID_1">%1$s</xliff:g>. Thay vào đó, bạn có muốn sử dụng kiểu <xliff:g id="ID_2">%1$s</xliff:g> không?"</string>
+    <string name="use_style_button" msgid="1754493078383627019">"Sử dụng kiểu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Không, cảm ơn"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Bản xem trước đồng hồ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="something_went_wrong" msgid="529840112449799117">"Rất tiếc! Đã xảy ra lỗi."</string>