Unverified Commit ac870634 authored by Mihai Adrian Carare's avatar Mihai Adrian Carare Committed by GitHub
Browse files

For #12533: Align main settings categories according to specs. (#12534)

parent 4b74ff18

app/src/main/res/layout/preference_category_main_style.xml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<?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" />

app/src/main/res/xml/preferences.xml

+5 −5
Original line number Diff line number Diff line
@@ -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"