From 90f43bf3508072bdb9a4ba23691971a105774800 Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Mon, 6 Jul 2020 15:25:54 -0400
Subject: [PATCH] For #12086: Follow ux mock on Settings --> Customize screen
 (#12324)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hakkı Kaan Çalışkan <caliskanhkaan@gmail.com>
---
 app/src/main/res/layout/preference_cat_style.xml   | 14 ++++++++------
 .../res/layout/preference_widget_radiobutton.xml   |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/preference_cat_style.xml b/app/src/main/res/layout/preference_cat_style.xml
index 5ab3d00a1..e42206621 100644
--- a/app/src/main/res/layout/preference_cat_style.xml
+++ b/app/src/main/res/layout/preference_cat_style.xml
@@ -1,13 +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"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/title"
+    style="?android:attr/listViewStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="?android:attr/listViewStyle"
-    android:layout_marginTop="16dp"
-    android:textAlignment="viewStart"
     android:layout_marginStart="72dp"
+    android:layout_marginTop="16dp"
     android:gravity="start|center_vertical"
-    app:fontFamily="@font/metropolis_semibold"
-    android:id="@android:id/title" />
+    android:textAlignment="viewStart"
+    app:fontFamily="@font/metropolis_semibold" />
diff --git a/app/src/main/res/layout/preference_widget_radiobutton.xml b/app/src/main/res/layout/preference_widget_radiobutton.xml
index b534f4aab..ae73ed749 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton.xml
@@ -29,6 +29,7 @@
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
+        android:layout_marginStart="8dp"
         android:layout_height="wrap_content"
         android:gravity="center|start"
         android:layout_marginEnd="@dimen/radio_button_preference_horizontal"