From ac870634ff6742ab09f401b949a41c4d6ae7278b Mon Sep 17 00:00:00 2001
From: Mihai Adrian Carare <48995920+mcarare@users.noreply.github.com>
Date: Wed, 29 Jul 2020 18:08:00 +0300
Subject: [PATCH] For #12533: Align main settings categories according to
 specs. (#12534)

---
 .../res/layout/preference_category_main_style.xml | 15 +++++++++++++++
 app/src/main/res/xml/preferences.xml              | 10 +++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout/preference_category_main_style.xml

diff --git a/app/src/main/res/layout/preference_category_main_style.xml b/app/src/main/res/layout/preference_category_main_style.xml
new file mode 100644
index 000000000..f1444e7d2
--- /dev/null
+++ b/app/src/main/res/layout/preference_category_main_style.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@android:id/title"
+    style="?android:attr/listViewStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="16dp"
+    android:gravity="start|center_vertical"
+    android:textAlignment="viewStart"
+    app:fontFamily="@font/metropolis_semibold" />
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b9d8a73f4..8e6062573 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -19,7 +19,7 @@
         android:title="@string/preferences_category_account"
         app:iconSpaceReserved="false"
         app:isPreferenceVisible="false"
-        android:layout="@layout/preference_cat_style" >
+        android:layout="@layout/preference_category_main_style" >
 
         <org.mozilla.fenix.settings.account.AccountPreference
             android:icon="@drawable/ic_account"
@@ -47,7 +47,7 @@
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_general"
         app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style" >
+        android:layout="@layout/preference_category_main_style" >
         <androidx.preference.Preference
             android:icon="@drawable/ic_search"
             android:key="@string/pref_key_search_settings"
@@ -82,7 +82,7 @@
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_privacy_security"
         app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_main_style">
 
         <androidx.preference.Preference
             android:icon="@drawable/ic_private_browsing"
@@ -120,7 +120,7 @@
         android:title="@string/preferences_category_advanced"
         app:iconSpaceReserved="false"
         android:key="@string/pref_key_advanced"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_main_style">
         <androidx.preference.Preference
             android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_addons"
@@ -149,7 +149,7 @@
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_about"
         app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_main_style">
         <androidx.preference.Preference
             android:icon="@drawable/ic_bookmark_outline"
             android:key="@string/pref_key_rate"