From 4d771813b41e6bb1bc9a07f77adb229a9dc19825 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 11 Oct 2019 18:03:49 -0700
Subject: [PATCH 1/2] No issue: Update androidx fragment Oct 11

---
 buildSrc/src/main/java/Dependencies.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 89344bdb2..20526fe0a 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -24,7 +24,7 @@ object Versions {
     const val androidx_legacy = "1.0.0"
     const val androidx_annotation = "1.1.0"
     const val androidx_lifecycle = "2.2.0-beta01"
-    const val androidx_fragment = "1.2.0-beta01"
+    const val androidx_fragment = "1.2.0-beta02"
     const val androidx_navigation = "2.2.0-beta01"
     const val androidx_recyclerview = "1.1.0-beta05"
     const val androidx_testing = "1.2.1-alpha02"

From b1dcc69e52d0619f15734437c014a463f42c9873 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Mon, 14 Oct 2019 15:59:43 +0300
Subject: [PATCH 2/2] For #5709: Align ETP Settings Screen implementation with
 original mocks

---
 .../res/layout/preference_widget_radiobutton_with_info.xml  | 4 +++-
 .../layout/tracking_protection_learn_more_preference.xml    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml b/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
index 6d1305ec9..31d82bb83 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
-        android:layout_marginStart="42dp"
+        android:layout_marginStart="66dp"
         android:background="@android:color/transparent"
         android:button="@null"
         android:clickable="false"
@@ -55,6 +55,8 @@
         android:id="@+id/vertical_divider"
         android:layout_width="1dp"
         android:layout_height="0dp"
+        android:paddingStart="1dp"
+        android:paddingEnd="1dp"
         android:background="?neutralFaded"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/info_button"
diff --git a/app/src/main/res/layout/tracking_protection_learn_more_preference.xml b/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
index 62a39a7c3..72259c3ed 100644
--- a/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
+++ b/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
@@ -7,7 +7,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="12dp"
-    android:paddingTop="20dp"
     android:background="#FF0250BB">
 
     <ImageView
@@ -25,6 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
+        android:paddingTop="20dp"
         android:ellipsize="none"
         android:letterSpacing="0.05"
         android:scrollHorizontally="false"
@@ -46,7 +46,7 @@
         android:scrollHorizontally="false"
         android:text="@string/preference_enhanced_tracking_protection_explanation"
         android:textColor="@color/primary_text_dark_theme"
-        android:textSize="12sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/learn_more"
         app:layout_constraintEnd_toStartOf="@id/guideline"
         app:layout_constraintHorizontal_bias="0.5"
@@ -61,7 +61,7 @@
         android:ellipsize="none"
         android:text="@string/preference_enhanced_tracking_protection_explanation_learn_more"
         android:textColor="@color/primary_text_dark_theme"
-        android:textSize="12sp"
+        android:textSize="14sp"
         app:layout_constraintEnd_toStartOf="@id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@android:id/title"