Merge "Remove hard-coded colors in Wallpaper Picker" into sc-dev
diff --git a/res/layout/fragment_grid_picker.xml b/res/layout/fragment_grid_picker.xml
index 57aee6c..f700310 100644
--- a/res/layout/fragment_grid_picker.xml
+++ b/res/layout/fragment_grid_picker.xml
@@ -52,6 +52,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/options_container_height"
android:layout_marginBottom="@dimen/options_container_bottom_margin"
+ android:layout_marginHorizontal="@dimen/options_container_horizontal_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3081b1d..3c1dc9d 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/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-ne/strings.xml b/res/values-ne/strings.xml
index 89fc4d6..a54d7b7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/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>
@@ -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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 986eebe..cde8019 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6995669566699638946">"Estilos e imagens de fundo"</string>
+ <string name="app_name" msgid="6995669566699638946">"Estilos e fundo"</string>
<string name="theme_title" msgid="2144932106319405101">"Estilo"</string>
<string name="clock_title" msgid="2126046720254613991">"Relógio"</string>
<string name="grid_title" msgid="1688173478777254123">"Grelha de apps"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6a04025..09355a9 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/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-ur/strings.xml b/res/values-ur/strings.xml
index 50cf138..69079cc 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/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/dimens.xml b/res/values/dimens.xml
index 37718ec..ef9f417 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -32,7 +32,8 @@
<dimen name="options_container_height">124dp</dimen>
<dimen name="options_container_width">0dp</dimen>
<dimen name="options_container_bottom_margin">12dp</dimen>
- <dimen name="option_tile_width">88dp</dimen>
+ <dimen name="options_container_horizontal_margin">24dp</dimen>
+ <dimen name="option_tile_width">82dp</dimen>
<dimen name="option_icon_size">16dp</dimen>
<dimen name="theme_option_icon_sample_height">22dp</dimen>
<dimen name="theme_option_icon_sample_width">22dp</dimen>