From 56b0b28d5eb40b038c0e1c38cbefe4d1da8159ef Mon Sep 17 00:00:00 2001
From: koh6uawi <89084173+koh6uawi@users.noreply.github.com>
Date: Fri, 8 Oct 2021 01:51:05 +0200
Subject: [PATCH 1/4] Make "Select text size" dialog scrollable

Wrap the LinearLayout inside a ScrollView.
---
 .../res/layout/dialog_select_text_size.xml    | 152 +++++++++---------
 1 file changed, 78 insertions(+), 74 deletions(-)

diff --git a/vector/src/main/res/layout/dialog_select_text_size.xml b/vector/src/main/res/layout/dialog_select_text_size.xml
index 1a3bd91485..0790adf88a 100644
--- a/vector/src/main/res/layout/dialog_select_text_size.xml
+++ b/vector/src/main/res/layout/dialog_select_text_size.xml
@@ -1,83 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/text_selection_group_view"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="?dialogPreferredPadding"
-    android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    tools:ignore="SpUsage">
-
-    <!-- keep the sizes in dp -->
-    <CheckedTextView
-        android:id="@+id/text_selection_tiny_text_view"
+    android:layout_height="match_parent">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/text_selection_group_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/tiny"
-        android:textSize="10dp" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="?dialogPreferredPadding"
+        android:paddingTop="12dp"
+        android:paddingEnd="?dialogPreferredPadding"
+        tools:ignore="SpUsage">
 
-    <CheckedTextView
-        android:id="@+id/text_selection_small_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/small"
-        android:textSize="12dp" />
+        <!-- keep the sizes in dp -->
+        <CheckedTextView
+            android:id="@+id/text_selection_tiny_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/tiny"
+            android:textSize="10dp" />
 
-    <CheckedTextView
-        android:id="@+id/text_selection_normal_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/normal"
-        android:textSize="14dp" />
+        <CheckedTextView
+            android:id="@+id/text_selection_small_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/small"
+            android:textSize="12dp" />
 
-    <CheckedTextView
-        android:id="@+id/text_selection_large_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/large"
-        android:textSize="16dp" />
+        <CheckedTextView
+            android:id="@+id/text_selection_normal_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/normal"
+            android:textSize="14dp" />
 
-    <CheckedTextView
-        android:id="@+id/text_selection_larger_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/larger"
-        android:textSize="18dp" />
+        <CheckedTextView
+            android:id="@+id/text_selection_large_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/large"
+            android:textSize="16dp" />
 
-    <CheckedTextView
-        android:id="@+id/text_selection_largest_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/largest"
-        android:textSize="20dp" />
+        <CheckedTextView
+            android:id="@+id/text_selection_larger_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/larger"
+            android:textSize="18dp" />
 
-    <CheckedTextView
-        android:id="@+id/text_selection_huge_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:checkMark="?android:attr/listChoiceIndicatorSingle"
-        android:gravity="center_vertical"
-        android:text="@string/huge"
-        android:textSize="22dp" />
-</LinearLayout>
\ No newline at end of file
+        <CheckedTextView
+            android:id="@+id/text_selection_largest_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/largest"
+            android:textSize="20dp" />
+
+        <CheckedTextView
+            android:id="@+id/text_selection_huge_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:gravity="center_vertical"
+            android:text="@string/huge"
+            android:textSize="22dp" />
+    </LinearLayout>
+</ScrollView>

From fadaaa5b188fd89138d840879636290d34022762 Mon Sep 17 00:00:00 2001
From: koh6uawi <89084173+koh6uawi@users.noreply.github.com>
Date: Mon, 11 Oct 2021 13:07:28 +0200
Subject: [PATCH 2/4] Add a changelog entry

---
 changelog.d/4201.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4201.bugfix

diff --git a/changelog.d/4201.bugfix b/changelog.d/4201.bugfix
new file mode 100644
index 0000000000..fa8e506015
--- /dev/null
+++ b/changelog.d/4201.bugfix
@@ -0,0 +1 @@
+Make the font size selection dialog scrollable

From da28ddfabd701c444a8b3594d29117d5f211baaf Mon Sep 17 00:00:00 2001
From: koh6uawi <89084173+koh6uawi@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:10:33 +0200
Subject: [PATCH 3/4] Use "wrap_content" instead of "match_parent"

Fix a linter error
---
 vector/src/main/res/layout/dialog_select_text_size.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/dialog_select_text_size.xml b/vector/src/main/res/layout/dialog_select_text_size.xml
index 0790adf88a..967386476a 100644
--- a/vector/src/main/res/layout/dialog_select_text_size.xml
+++ b/vector/src/main/res/layout/dialog_select_text_size.xml
@@ -6,7 +6,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/text_selection_group_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
         android:paddingTop="12dp"

From c9f69b3fc5e1ca3526ad31bc2f3e91ffbd6a6577 Mon Sep 17 00:00:00 2001
From: koh6uawi <89084173+koh6uawi@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:12:26 +0200
Subject: [PATCH 4/4] Move XML namespaces to root element

---
 vector/src/main/res/layout/dialog_select_text_size.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/dialog_select_text_size.xml b/vector/src/main/res/layout/dialog_select_text_size.xml
index 967386476a..e93f524c1d 100644
--- a/vector/src/main/res/layout/dialog_select_text_size.xml
+++ b/vector/src/main/res/layout/dialog_select_text_size.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:id="@+id/text_selection_group_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"