Merge "Update call to WallpaperPickerDelegate.initialize" into sc-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2f401ed..5ce6b89 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Style en muurpapiere"</string>
<string name="theme_title" msgid="2144932106319405101">"Styl"</string>
<string name="clock_title" msgid="2126046720254613991">"Horlosie"</string>
- <string name="grid_title" msgid="2825094404523390773">"Rooster"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Programrooster"</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 8937592..06bc750 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"ቅጦች እና ልጣፎች"</string>
<string name="theme_title" msgid="2144932106319405101">"ቅጥ"</string>
<string name="clock_title" msgid="2126046720254613991">"ሰዓት"</string>
- <string name="grid_title" msgid="2825094404523390773">"ፍርግርግ"</string>
+ <string name="grid_title" msgid="1688173478777254123">"የመተግበሪያ ፍርግርግ"</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 7fd9b73..4b10270 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"الأنماط والخلفيات"</string>
<string name="theme_title" msgid="2144932106319405101">"النمط"</string>
<string name="clock_title" msgid="2126046720254613991">"الساعة"</string>
- <string name="grid_title" msgid="2825094404523390773">"شبكة"</string>
+ <string name="grid_title" msgid="1688173478777254123">"شبكة التطبيقات"</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 f872ba2..692c05b 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"শৈলী আৰু ৱালপেপাৰ"</string>
<string name="theme_title" msgid="2144932106319405101">"শৈলী"</string>
<string name="clock_title" msgid="2126046720254613991">"ঘড়ী"</string>
- <string name="grid_title" msgid="2825094404523390773">"গ্ৰিড"</string>
+ <string name="grid_title" msgid="1688173478777254123">"এপৰ গ্ৰিড"</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 60c4bdc..e5b06ee 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Üslub və divar kağızları"</string>
<string name="theme_title" msgid="2144932106319405101">"Üslub"</string>
<string name="clock_title" msgid="2126046720254613991">"Saat"</string>
- <string name="grid_title" msgid="2825094404523390773">"Tor"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Tətbiq toru"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tətbiq edin"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Redaktə etmək üçün klikləyin"</string>
<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 af0b0c7..6096b40 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stilovi i pozadine"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Sat"</string>
- <string name="grid_title" msgid="2825094404523390773">"Mreža"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Mreža apl."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da biste izmenili"</string>
<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 42d2c64..6cab527 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Стылі і шпалеры"</string>
<string name="theme_title" msgid="2144932106319405101">"Стыль"</string>
<string name="clock_title" msgid="2126046720254613991">"Гадзіннік"</string>
- <string name="grid_title" msgid="2825094404523390773">"Сетка"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Сетка праграм"</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 cbe934f..e8c623a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Стилове и тапети"</string>
<string name="theme_title" msgid="2144932106319405101">"Стил"</string>
<string name="clock_title" msgid="2126046720254613991">"Часовник"</string>
- <string name="grid_title" msgid="2825094404523390773">"Решетка"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Решетка с прил."</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 5cba9cd..4a5b72f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stilovi i pozadinske slike"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Sat"</string>
- <string name="grid_title" msgid="2825094404523390773">"Mreža"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Mreža aplikacija"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primijeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da uredite"</string>
<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 8d1491f..91072cb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estils i fons de pantalla"</string>
<string name="theme_title" msgid="2144932106319405101">"Estil"</string>
<string name="clock_title" msgid="2126046720254613991">"Rellotge"</string>
- <string name="grid_title" msgid="2825094404523390773">"Graella"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Quadrícula d\'apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplica"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca per editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantén el fons de pantalla actual"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 01982ac..d3c3f15 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styly a tapety"</string>
<string name="theme_title" msgid="2144932106319405101">"Styl"</string>
<string name="clock_title" msgid="2126046720254613991">"Hodiny"</string>
- <string name="grid_title" msgid="2825094404523390773">"Mřížka"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Mřížka aplikací"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Použít"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Klepnutím upravte"</string>
<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 a8f9878..a3666b9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stil og baggrunde"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Ur"</string>
- <string name="grid_title" msgid="2825094404523390773">"Gitter"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Appgitter"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Anvend"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tryk for at redigere"</string>
<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 b40d0f8..0017029 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Designs & Hintergründe"</string>
<string name="theme_title" msgid="2144932106319405101">"Design"</string>
<string name="clock_title" msgid="2126046720254613991">"Uhr"</string>
- <string name="grid_title" msgid="2825094404523390773">"Raster"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App-Raster"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Anwenden"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Zum Bearbeiten tippen"</string>
<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 4b2d72f..08bb056 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Στιλ και ταπετσαρίες"</string>
<string name="theme_title" msgid="2144932106319405101">"Στιλ"</string>
<string name="clock_title" msgid="2126046720254613991">"Ρολόι"</string>
- <string name="grid_title" msgid="2825094404523390773">"Πλέγμα"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Πλέγμα εφαρμ."</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 d1da637..6682683 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles & wallpapers"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Clock"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index d1da637..6682683 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles & wallpapers"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Clock"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<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 d1da637..6682683 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles & wallpapers"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Clock"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<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 d1da637..6682683 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles & wallpapers"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Clock"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index df45b34..763d76e 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles & wallpapers"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Clock"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App grid"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Apply"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap to edit"</string>
<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 ccc098d..8f9e38d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estilos y fondos de pantalla"</string>
<string name="theme_title" msgid="2144932106319405101">"Estilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Reloj"</string>
- <string name="grid_title" msgid="2825094404523390773">"Cuadrícula"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Cuadr. de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Presiona para editar"</string>
<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 e2a0bc2..d73d78c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estilos y fondos de pantalla"</string>
<string name="theme_title" msgid="2144932106319405101">"Estilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Reloj"</string>
- <string name="grid_title" msgid="2825094404523390773">"Cuadrícula"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Cuadrícula de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca para editar"</string>
<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 d9855ad..51568d5 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stiilid ja taustapildid"</string>
<string name="theme_title" msgid="2144932106319405101">"Stiil"</string>
<string name="clock_title" msgid="2126046720254613991">"Kell"</string>
- <string name="grid_title" msgid="2825094404523390773">"Ruudustik"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Rak. ruudustik"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Rakenda"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Puudutage muutmiseks"</string>
<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 9a52f6f..5582d96 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estiloak eta horma-paperak"</string>
<string name="theme_title" msgid="2144932106319405101">"Estiloa"</string>
<string name="clock_title" msgid="2126046720254613991">"Erlojua"</string>
- <string name="grid_title" msgid="2825094404523390773">"Sareta"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Aplikazioen sareta"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplikatu"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Sakatu editatzeko"</string>
<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 c7d6be6..94ac058 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"سبک و کاغذدیواری"</string>
<string name="theme_title" msgid="2144932106319405101">"سبک"</string>
<string name="clock_title" msgid="2126046720254613991">"ساعت"</string>
- <string name="grid_title" msgid="2825094404523390773">"جدول"</string>
+ <string name="grid_title" msgid="1688173478777254123">"جدول برنامه"</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 e3ceb4f..6c438ec 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Tyylit ja taustakuvat"</string>
<string name="theme_title" msgid="2144932106319405101">"Tyyli"</string>
<string name="clock_title" msgid="2126046720254613991">"Kello"</string>
- <string name="grid_title" msgid="2825094404523390773">"Ruudukko"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Ruudukko"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Käytä"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Muokkaa napauttamalla"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Säilytä nykyinen taustakuva"</string>
@@ -63,7 +63,7 @@
<string name="icon_component_label" msgid="2625784884001407944">"Kuvakkeet <xliff:g id="ID_1">%1$d</xliff:g>"</string>
<string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Poistetaanko oma tyyli?"</string>
<string name="delete_custom_theme_button" msgid="5102462988130208824">"Poista"</string>
- <string name="cancel" msgid="4651030493668562067">"Peruuta"</string>
+ <string name="cancel" msgid="4651030493668562067">"Peru"</string>
<string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Aseta tyylin taustakuva"</string>
<string name="use_style_instead_title" msgid="1578754995763917502">"Valitaanko sittenkin <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> on tyyliltään sama kuin valitsemasi osat. Haluatko mieluummin, että <xliff:g id="ID_2">%1$s</xliff:g> valitaan?"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f3eebc5..dfe5241 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles et fonds d\'écran"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Horloge"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grille"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grille d\'applis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Appliquer"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toucher pour modifier"</string>
<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 2308039..8dca276 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Styles et fonds d\'écran"</string>
<string name="theme_title" msgid="2144932106319405101">"Style"</string>
<string name="clock_title" msgid="2126046720254613991">"Horloge"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grille"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grille appli"</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 5053104..fc68b47 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estilos e fondos de pantalla"</string>
<string name="theme_title" msgid="2144932106319405101">"Estilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Reloxo"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grade"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grade de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toca para editar"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Conservar fondo de pantalla actual"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1ad8fe4..8cf17e5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"स्टाइल और वॉलपेपर"</string>
<string name="theme_title" msgid="2144932106319405101">"शैली"</string>
<string name="clock_title" msgid="2126046720254613991">"घड़ी"</string>
- <string name="grid_title" msgid="2825094404523390773">"ग्रिड"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ऐप्लिकेशन ग्रिड"</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 8c4b6dd..9054385 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stilovi i pozadine"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Sat"</string>
- <string name="grid_title" msgid="2825094404523390773">"Rešetka"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Rešetka aplik."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Primijeni"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dodirnite da biste uredili"</string>
<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 d6f2b80..cc6947e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stílusok és háttérképek"</string>
<string name="theme_title" msgid="2144932106319405101">"Stílus"</string>
<string name="clock_title" msgid="2126046720254613991">"Óra"</string>
- <string name="grid_title" msgid="2825094404523390773">"Rács"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Alkalmazásrács"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Alkalmaz"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Koppintson a szerkesztéshez"</string>
<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 6d47e15..5502427 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Ոճեր և պաստառներ"</string>
<string name="theme_title" msgid="2144932106319405101">"Ոճ"</string>
<string name="clock_title" msgid="2126046720254613991">"Ժամացույց"</string>
- <string name="grid_title" msgid="2825094404523390773">"Ցանց"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Հավելվածների ցանց"</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 f0bb52d..6b2a278 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Gaya & wallpaper"</string>
<string name="theme_title" msgid="2144932106319405101">"Gaya"</string>
<string name="clock_title" msgid="2126046720254613991">"Jam"</string>
- <string name="grid_title" msgid="2825094404523390773">"Petak"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Petak aplikasi"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Terapkan"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketuk untuk mengedit"</string>
<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 a484d86..23cf7eb 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stílar og veggfóður"</string>
<string name="theme_title" msgid="2144932106319405101">"Stíll"</string>
<string name="clock_title" msgid="2126046720254613991">"Klukka"</string>
- <string name="grid_title" msgid="2825094404523390773">"Töfluyfirlit"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Forritatafla"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Nota"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ýttu til að breyta"</string>
<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 bb82653..99976ce 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stili e sfondi"</string>
<string name="theme_title" msgid="2144932106319405101">"Stile"</string>
<string name="clock_title" msgid="2126046720254613991">"Orologio"</string>
- <string name="grid_title" msgid="2825094404523390773">"Griglia"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Griglia di app"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Applica"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tocca per modificare"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantieni lo sfondo corrente"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2a377f9..4045cde 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"スタイルと壁紙"</string>
<string name="theme_title" msgid="2144932106319405101">"スタイル"</string>
<string name="clock_title" msgid="2126046720254613991">"時計"</string>
- <string name="grid_title" msgid="2825094404523390773">"グリッド"</string>
+ <string name="grid_title" msgid="1688173478777254123">"アプリグリッド"</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 a29340c..ee8babf 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"სტილები და ფონები"</string>
<string name="theme_title" msgid="2144932106319405101">"სტილი"</string>
<string name="clock_title" msgid="2126046720254613991">"საათი"</string>
- <string name="grid_title" msgid="2825094404523390773">"ბადე"</string>
+ <string name="grid_title" msgid="1688173478777254123">"აპების ბადე"</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 3514dbc..bb0516d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"រចនាប័ទ្ម និងផ្ទាំងរូបភាព"</string>
<string name="theme_title" msgid="2144932106319405101">"រចនាប័ទ្ម"</string>
<string name="clock_title" msgid="2126046720254613991">"នាឡិកា"</string>
- <string name="grid_title" msgid="2825094404523390773">"ក្រឡា"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ក្រឡាកម្មវិធី"</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 ab65f2d..1e9a812 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"스타일 및 배경화면"</string>
<string name="theme_title" msgid="2144932106319405101">"스타일"</string>
<string name="clock_title" msgid="2126046720254613991">"시계"</string>
- <string name="grid_title" msgid="2825094404523390773">"그리드"</string>
+ <string name="grid_title" msgid="1688173478777254123">"앱 그리드"</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 d300714..d8afc99 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"ຮູບແບບ ແລະ ຮູບພື້ນຫຼັງ"</string>
<string name="theme_title" msgid="2144932106319405101">"ຮູບແບບ"</string>
<string name="clock_title" msgid="2126046720254613991">"ໂມງ"</string>
- <string name="grid_title" msgid="2825094404523390773">"ເສັ້ນ"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ຕາຕະລາງແອັບ"</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 f27e49c..ae6c253 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stiliai ir ekrano fonai"</string>
<string name="theme_title" msgid="2144932106319405101">"Stilius"</string>
<string name="clock_title" msgid="2126046720254613991">"Laikrodis"</string>
- <string name="grid_title" msgid="2825094404523390773">"Tinklelis"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Pr. tinklelis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Taikyti"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Palieskite ir redaguokite"</string>
<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 5f45ebe..0c089e6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stili un fona tapetes"</string>
<string name="theme_title" msgid="2144932106319405101">"Stils"</string>
<string name="clock_title" msgid="2126046720254613991">"Pulkstenis"</string>
- <string name="grid_title" msgid="2825094404523390773">"Režģis"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Lietotņu režģis"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Lietot"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Pieskarieties, lai rediģētu"</string>
<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 a23349c..f840490 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Стилови и тапети"</string>
<string name="theme_title" msgid="2144932106319405101">"Стил"</string>
<string name="clock_title" msgid="2126046720254613991">"Часовник"</string>
- <string name="grid_title" msgid="2825094404523390773">"Мрежа"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Мрежа"</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 e431b6a..88f4d8f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"സ്റ്റൈലുകളും വാൾപേപ്പറുകളും"</string>
<string name="theme_title" msgid="2144932106319405101">"സ്റ്റൈൽ"</string>
<string name="clock_title" msgid="2126046720254613991">"ക്ലോക്ക്"</string>
- <string name="grid_title" msgid="2825094404523390773">"ഗ്രിഡ്"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ആപ്പ് ഗ്രിഡ്"</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 3f6c736..4438c28 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Загвар ба дэлгэцийн зураг"</string>
<string name="theme_title" msgid="2144932106319405101">"Загвар"</string>
<string name="clock_title" msgid="2126046720254613991">"Цаг"</string>
- <string name="grid_title" msgid="2825094404523390773">"Эгнээ"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Аппын хүснэгт"</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 e0eacb4..4793cc5 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"शैली आणि वॉलपेपर"</string>
<string name="theme_title" msgid="2144932106319405101">"शैली"</string>
<string name="clock_title" msgid="2126046720254613991">"घड्याळ"</string>
- <string name="grid_title" msgid="2825094404523390773">"ग्रिड"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ॲप ग्रिड"</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 7d3e31a..804dd12 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Gaya & kertas dinding"</string>
<string name="theme_title" msgid="2144932106319405101">"Gaya"</string>
<string name="clock_title" msgid="2126046720254613991">"Jam"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grid apl"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Gunakan"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketik untuk edit"</string>
<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 1cadfab..05cfd1c 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"ပုံစံနှင့် နောက်ခံပုံများ"</string>
<string name="theme_title" msgid="2144932106319405101">"ပုံစံ"</string>
<string name="clock_title" msgid="2126046720254613991">"နာရီ"</string>
- <string name="grid_title" msgid="2825094404523390773">"ဇယားကွက်"</string>
+ <string name="grid_title" msgid="1688173478777254123">"အက်ပ်ဇယား"</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 faf7672..c4bdf11 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stiler og bakgrunner"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Klokke"</string>
- <string name="grid_title" msgid="2825094404523390773">"Rutenett"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Apprutenett"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Bruk"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Trykk for å endre"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Behold den nåværende bakgrunnen"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f2ce862..3eed531 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stijl en achtergrond"</string>
<string name="theme_title" msgid="2144932106319405101">"Stijl"</string>
<string name="clock_title" msgid="2126046720254613991">"Klok"</string>
- <string name="grid_title" msgid="2825094404523390773">"Raster"</string>
+ <string name="grid_title" msgid="1688173478777254123">"App-raster"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Toepassen"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tik om te bewerken"</string>
<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 fae530c..06c26bc 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"ଷ୍ଟାଇଲ୍ ଏବଂ ୱାଲପେପର୍"</string>
<string name="theme_title" msgid="2144932106319405101">"ଷ୍ଟାଇଲ୍"</string>
<string name="clock_title" msgid="2126046720254613991">"ଘଣ୍ଟା"</string>
- <string name="grid_title" msgid="2825094404523390773">"ଗ୍ରିଡ୍"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ଆପ୍ ଗ୍ରିଡ୍"</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 eaf982b..e527028 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"ਸ਼ੈਲੀਆਂ ਅਤੇ ਵਾਲਪੇਪਰ"</string>
<string name="theme_title" msgid="2144932106319405101">"ਸ਼ੈਲੀ"</string>
<string name="clock_title" msgid="2126046720254613991">"ਘੜੀ"</string>
- <string name="grid_title" msgid="2825094404523390773">"ਗ੍ਰਿਡ"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ਐਪ ਗ੍ਰਿਡ"</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 db16d25..db4de94 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Style i tapety"</string>
<string name="theme_title" msgid="2144932106319405101">"Styl"</string>
<string name="clock_title" msgid="2126046720254613991">"Zegar"</string>
- <string name="grid_title" msgid="2825094404523390773">"Siatka"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Siatka aplikacji"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Zastosuj"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Kliknij, by edytować"</string>
<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 356db07..986eebe 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estilos e imagens de fundo"</string>
<string name="theme_title" msgid="2144932106319405101">"Estilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Relógio"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grelha"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grelha de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toque para editar"</string>
<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 fe7c5ff..2449d00 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Estilos e planos de fundo"</string>
<string name="theme_title" msgid="2144932106319405101">"Estilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Relógio"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grade"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grade de apps"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicar"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Toque para editar"</string>
<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 d8dd4cd..c37c035 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stiluri și imagini de fundal"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Ceas"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grilă"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grilă aplicații"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Aplicați"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Atingeți pentru a modifica"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Păstrați imaginea de fundal actuală"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ca20113..3850fea 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Стили и обои"</string>
<string name="theme_title" msgid="2144932106319405101">"Стиль"</string>
<string name="clock_title" msgid="2126046720254613991">"Часы"</string>
- <string name="grid_title" msgid="2825094404523390773">"Сетка"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Сетка прилож-ий"</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 38e813c..9213e37 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"විලාස සහ වෝල්පේපර"</string>
<string name="theme_title" msgid="2144932106319405101">"විලාසය"</string>
<string name="clock_title" msgid="2126046720254613991">"ඔරලෝසුව"</string>
- <string name="grid_title" msgid="2825094404523390773">"ජාලකය"</string>
+ <string name="grid_title" msgid="1688173478777254123">"යෙදුම් ජාලකය"</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 dbc2ed0..14a7d70 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Štýly a tapety"</string>
<string name="theme_title" msgid="2144932106319405101">"Štýl"</string>
<string name="clock_title" msgid="2126046720254613991">"Hodiny"</string>
- <string name="grid_title" msgid="2825094404523390773">"Mriežka"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Mriežka aplik."</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Použiť"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Klepnutím upravte"</string>
<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 f88243f..d201346 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Slogi in ozadja"</string>
<string name="theme_title" msgid="2144932106319405101">"Slog"</string>
<string name="clock_title" msgid="2126046720254613991">"Ura"</string>
- <string name="grid_title" msgid="2825094404523390773">"Mreža"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Mreža aplikacij"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Uporabi"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Dotaknite se za urejanje"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Obdrži trenutno ozadje"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 26bd8f4..a2ae898 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Стилови и позадине"</string>
<string name="theme_title" msgid="2144932106319405101">"Стил"</string>
<string name="clock_title" msgid="2126046720254613991">"Сат"</string>
- <string name="grid_title" msgid="2825094404523390773">"Мрежа"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Мрежа апл."</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 d44e9df..bc02057 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Format och bakgrunder"</string>
<string name="theme_title" msgid="2144932106319405101">"Format"</string>
<string name="clock_title" msgid="2126046720254613991">"Klocka"</string>
- <string name="grid_title" msgid="2825094404523390773">"Rutnät"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Apprutnät"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Använd"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tryck för att redigera"</string>
<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 5c4ea2b..ae6ebb0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Mitindo na mandhari"</string>
<string name="theme_title" msgid="2144932106319405101">"Mtindo"</string>
<string name="clock_title" msgid="2126046720254613991">"Saa"</string>
- <string name="grid_title" msgid="2825094404523390773">"Gridi"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Gridi ya programu"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tumia"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Gusa ili ubadilishe"</string>
<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 2cbdb08..985dbcc 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"ஸ்டைல்கள் & வால்பேப்பர்கள்"</string>
<string name="theme_title" msgid="2144932106319405101">"ஸ்டைல்"</string>
<string name="clock_title" msgid="2126046720254613991">"கடிகாரம்"</string>
- <string name="grid_title" msgid="2825094404523390773">"கட்டம்"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ஆப்ஸ் கட்டம்"</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 f68ff73..090ac65 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"รูปแบบและวอลเปเปอร์"</string>
<string name="theme_title" msgid="2144932106319405101">"รูปแบบ"</string>
<string name="clock_title" msgid="2126046720254613991">"นาฬิกา"</string>
- <string name="grid_title" msgid="2825094404523390773">"ตารางกริด"</string>
+ <string name="grid_title" msgid="1688173478777254123">"ตารางกริดแอป"</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 173e8af..64cc8d5 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Mga istilo at wallpaper"</string>
<string name="theme_title" msgid="2144932106319405101">"Istilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Orasan"</string>
- <string name="grid_title" msgid="2825094404523390773">"Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Grid ng app"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Ilapat"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"I-tap para ma-edit"</string>
<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 e3fcc59..5739b31 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Stiller ve duvar kağıtları"</string>
<string name="theme_title" msgid="2144932106319405101">"Stil"</string>
<string name="clock_title" msgid="2126046720254613991">"Saat"</string>
- <string name="grid_title" msgid="2825094404523390773">"Tablo"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Uygulama tablosu"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Uygula"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Düzenlemek için dokunun"</string>
<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 91cf3aa..a78e676 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Стилі й фонові малюнки"</string>
<string name="theme_title" msgid="2144932106319405101">"Стиль"</string>
<string name="clock_title" msgid="2126046720254613991">"Годинник"</string>
- <string name="grid_title" msgid="2825094404523390773">"Сітка"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Сітка додатків"</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 f2d5ea5..69731d8 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">"Katak"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Ilovalar jadvali"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Tatbiq etish"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tahrirlash uchun tegining"</string>
<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 31558f5..ffea266 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Kiểu và hình nền"</string>
<string name="theme_title" msgid="2144932106319405101">"Kiểu"</string>
<string name="clock_title" msgid="2126046720254613991">"Đồng hồ"</string>
- <string name="grid_title" msgid="2825094404523390773">"Lưới"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Lưới ứng dụng"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Áp dụng"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Nhấn để chỉnh sửa"</string>
<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 2475a90..709a79b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"样式和壁纸"</string>
<string name="theme_title" msgid="2144932106319405101">"样式"</string>
<string name="clock_title" msgid="2126046720254613991">"时钟"</string>
- <string name="grid_title" msgid="2825094404523390773">"网格"</string>
+ <string name="grid_title" msgid="1688173478777254123">"应用网格"</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 7ac1255..bac082a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"樣式和桌布"</string>
<string name="theme_title" msgid="2144932106319405101">"樣式"</string>
<string name="clock_title" msgid="2126046720254613991">"時鐘"</string>
- <string name="grid_title" msgid="2825094404523390773">"格狀"</string>
+ <string name="grid_title" msgid="1688173478777254123">"應用程式網格"</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 ca8111e..1652700 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"樣式和桌布"</string>
<string name="theme_title" msgid="2144932106319405101">"樣式"</string>
<string name="clock_title" msgid="2126046720254613991">"時鐘"</string>
- <string name="grid_title" msgid="2825094404523390773">"網格"</string>
+ <string name="grid_title" msgid="1688173478777254123">"應用程式格線"</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 e86321b..c768ede 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="6995669566699638946">"Izitayela nezithombe zangemuva"</string>
<string name="theme_title" msgid="2144932106319405101">"Isitayela"</string>
<string name="clock_title" msgid="2126046720254613991">"Iwashi"</string>
- <string name="grid_title" msgid="2825094404523390773">"I-Grid"</string>
+ <string name="grid_title" msgid="1688173478777254123">"Igridi ye-app"</string>
<string name="apply_theme_btn" msgid="6293081192321303991">"Faka"</string>
<string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Thepha ukuze uhlele"</string>
<string name="keep_my_wallpaper" msgid="8012385376769568517">"Gcina isithombe sangemuva samanje"</string>
diff --git a/src/com/android/customization/model/grid/GridOptionsManager.java b/src/com/android/customization/model/grid/GridOptionsManager.java
index cf55147..1f67ad6 100644
--- a/src/com/android/customization/model/grid/GridOptionsManager.java
+++ b/src/com/android/customization/model/grid/GridOptionsManager.java
@@ -15,14 +15,19 @@
*/
package com.android.customization.model.grid;
+import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.android.customization.model.CustomizationManager;
+import com.android.customization.module.CustomizationInjector;
import com.android.customization.module.ThemesUserEventLogger;
+import com.android.wallpaper.R;
+import com.android.wallpaper.module.InjectorProvider;
import java.util.List;
@@ -31,10 +36,28 @@
*/
public class GridOptionsManager implements CustomizationManager<GridOption> {
+ private static GridOptionsManager sGridOptionsManager;
+
private final LauncherGridOptionsProvider mProvider;
private final ThemesUserEventLogger mEventLogger;
- public GridOptionsManager(LauncherGridOptionsProvider provider, ThemesUserEventLogger logger) {
+ /** Returns the {@link GridOptionsManager} instance. */
+ public static GridOptionsManager get(Context context) {
+ if (sGridOptionsManager == null) {
+ Context appContext = context.getApplicationContext();
+ CustomizationInjector injector = (CustomizationInjector) InjectorProvider.getInjector();
+ ThemesUserEventLogger eventLogger = (ThemesUserEventLogger) injector.getUserEventLogger(
+ appContext);
+ sGridOptionsManager = new GridOptionsManager(
+ new LauncherGridOptionsProvider(appContext,
+ appContext.getString(R.string.grid_control_metadata_name)),
+ eventLogger);
+ }
+ return sGridOptionsManager;
+ }
+
+ @VisibleForTesting
+ GridOptionsManager(LauncherGridOptionsProvider provider, ThemesUserEventLogger logger) {
mProvider = provider;
mEventLogger = logger;
}
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index e6d22da..fc125a7 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -44,7 +44,6 @@
import com.android.customization.model.clock.ContentProviderClockProvider;
import com.android.customization.model.grid.GridOption;
import com.android.customization.model.grid.GridOptionsManager;
-import com.android.customization.model.grid.LauncherGridOptionsProvider;
import com.android.customization.model.theme.DefaultThemeProvider;
import com.android.customization.model.theme.OverlayManagerCompat;
import com.android.customization.model.theme.ThemeBundle;
@@ -55,7 +54,6 @@
import com.android.customization.picker.clock.ClockFragment;
import com.android.customization.picker.clock.ClockFragment.ClockFragmentHost;
import com.android.customization.picker.grid.GridFragment;
-import com.android.customization.picker.grid.GridFragment.GridFragmentHost;
import com.android.customization.picker.theme.ThemeFragment;
import com.android.customization.picker.theme.ThemeFragment.ThemeFragmentHost;
import com.android.customization.widget.NoTintDrawableWrapper;
@@ -93,8 +91,7 @@
* Fragments providing customization options.
*/
public class CustomizationPickerActivity extends FragmentActivity implements WallpapersUiContainer,
- AppbarFragmentHost, CategoryFragmentHost, CustomizationFragmentHost,
- ThemeFragmentHost, GridFragmentHost,
+ AppbarFragmentHost, CategoryFragmentHost, CustomizationFragmentHost, ThemeFragmentHost,
ClockFragmentHost, BottomActionBarHost, FragmentTransactionChecker {
public static final String WALLPAPER_FLAVOR_EXTRA =
@@ -280,10 +277,7 @@
Log.d(TAG, "ClockManager not available, removing Clock section");
}
//Grid
- GridOptionsManager gridManager = new GridOptionsManager(
- new LauncherGridOptionsProvider(this,
- getString(R.string.grid_control_metadata_name)),
- eventLogger);
+ GridOptionsManager gridManager = GridOptionsManager.get(this);
if (gridManager.isAvailable()) {
mSections.put(R.id.nav_grid, new GridSection(R.id.nav_grid, gridManager));
} else {
@@ -474,12 +468,6 @@
}
@Override
- public GridOptionsManager getGridOptionsManager() {
- CustomizationSection section = mSections.get(R.id.nav_grid);
- return section == null ? null : (GridOptionsManager) section.getCustomizationManager();
- }
-
- @Override
public ThemeManager getThemeManager() {
CustomizationSection section = mSections.get(R.id.nav_theme);
return section == null ? null : (ThemeManager) section.getCustomizationManager();
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java
index f4a4ce4..a69b3a3 100644
--- a/src/com/android/customization/picker/grid/GridFragment.java
+++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -22,7 +22,6 @@
import static com.android.customization.picker.grid.GridFullPreviewFragment.EXTRA_WALLPAPER_INFO;
import static com.android.wallpaper.widget.BottomActionBar.BottomAction.APPLY;
-import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
@@ -70,13 +69,6 @@
private static final String TAG = "GridFragment";
- /**
- * Interface to be implemented by an Activity hosting a {@link GridFragment}
- */
- public interface GridFragmentHost {
- GridOptionsManager getGridOptionsManager();
- }
-
public static GridFragment newInstance(CharSequence title) {
GridFragment fragment = new GridFragment();
fragment.setArguments(AppbarFragment.createArguments(title));
@@ -113,14 +105,6 @@
}
};
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- mGridManager = ((GridFragmentHost) context).getGridOptionsManager();
- mEventLogger = (ThemesUserEventLogger)
- InjectorProvider.getInjector().getUserEventLogger(context);
- }
-
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -135,6 +119,10 @@
// Clear memory cache whenever grid fragment view is being loaded.
Glide.get(getContext()).clearMemory();
+
+ mGridManager = GridOptionsManager.get(getContext());
+ mEventLogger = (ThemesUserEventLogger) InjectorProvider.getInjector()
+ .getUserEventLogger(getContext());
setUpOptions(savedInstanceState);
SurfaceView wallpaperSurface = view.findViewById(R.id.wallpaper_preview_surface);
@@ -233,7 +221,7 @@
}
showError();
}
- }, false);
+ }, /*reload= */ true);
}
private GridOption getActiveOption(List<GridOption> options) {
diff --git a/src/com/android/customization/picker/grid/GridFullPreviewFragment.java b/src/com/android/customization/picker/grid/GridFullPreviewFragment.java
index abea1c1..f91cdcf 100644
--- a/src/com/android/customization/picker/grid/GridFullPreviewFragment.java
+++ b/src/com/android/customization/picker/grid/GridFullPreviewFragment.java
@@ -33,13 +33,9 @@
import com.android.customization.model.grid.GridOption;
import com.android.customization.model.grid.GridOptionsManager;
-import com.android.customization.model.grid.LauncherGridOptionsProvider;
-import com.android.customization.module.CustomizationInjector;
-import com.android.customization.module.ThemesUserEventLogger;
import com.android.customization.picker.WallpaperPreviewer;
import com.android.wallpaper.R;
import com.android.wallpaper.model.WallpaperInfo;
-import com.android.wallpaper.module.InjectorProvider;
import com.android.wallpaper.picker.AppbarFragment;
import com.android.wallpaper.widget.BottomActionBar;
@@ -93,16 +89,7 @@
SurfaceView wallpaperSurface = view.findViewById(R.id.wallpaper_preview_surface);
mWallpaperPreviewer = new WallpaperPreviewer(
getLifecycle(), getActivity(), wallpaperPreviewImage, wallpaperSurface);
-
- CustomizationInjector injector = (CustomizationInjector) InjectorProvider.getInjector();
- ThemesUserEventLogger eventLogger = (ThemesUserEventLogger) injector.getUserEventLogger(
- getContext());
- final GridOptionsManager gridManager = new GridOptionsManager(
- new LauncherGridOptionsProvider(getContext(),
- getString(R.string.grid_control_metadata_name)),
- eventLogger);
-
- mGridOptionPreviewer = new GridOptionPreviewer(gridManager,
+ mGridOptionPreviewer = new GridOptionPreviewer(GridOptionsManager.get(getContext()),
view.findViewById(R.id.grid_preview_container));
return view;
}