From 5c106bab04d65925bb5fc7c768ebb92305335da0 Mon Sep 17 00:00:00 2001
From: Peter_Liang <peterliang@google.com>
Date: Tue, 15 Feb 2022 15:03:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?New=20feature=20=E2=80=9CText=20and=20readi?=
 =?UTF-8?q?ng=20options=E2=80=9D=20for=20SetupWizard,=20Wallpaper,=20and?=
 =?UTF-8?q?=20Settings=20(22/n).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replace "Font size", "Display size" with "Text and Reading Options" in the Display Settings

Bug: 211503117
Test: manual test
Change-Id: I5d8027628dcf06d99274a6a7a781218d146519eb
---
 res/xml/display_settings.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 88f8bf138e7..ba52a301666 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -69,17 +69,10 @@
             settings:keywords="@string/keywords_dark_ui_mode"/>
 
         <Preference
-            android:key="font_size"
-            android:title="@string/title_font_size"
-            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
-            settings:controller="com.android.settings.display.FontSizePreferenceController"
-            settings:keywords="@string/keywords_font_size"/>
-
-        <com.android.settings.display.ScreenZoomPreference
-            android:key="display_settings_screen_zoom"
-            android:title="@string/screen_zoom_title"
-            android:fragment="com.android.settings.display.ScreenZoomSettings"
-            settings:keywords="@string/keywords_display_size"/>
+            android:fragment="com.android.settings.accessibility.TextReadingPreferenceFragment"
+            android:key="text_reading_options"
+            android:persistent="false"
+            android:title="@string/accessibility_text_reading_options_title" />
     </PreferenceCategory>
 
     <PreferenceCategory

From 74468a94cc569950e678cfc55af722ea4de4fe1d Mon Sep 17 00:00:00 2001
From: Peter_Liang <peterliang@google.com>
Date: Tue, 15 Feb 2022 15:45:58 +0800
Subject: [PATCH 2/2] Add keywords into Font Size, Display Size preferences.

Bug: 211503117
Test: manual test
Change-Id: I52de77a3af689a336bf8f40c668711a48b9bbc42
---
 res/xml/accessibility_text_reading_options.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/xml/accessibility_text_reading_options.xml b/res/xml/accessibility_text_reading_options.xml
index d55882d2011..ad742c949b4 100644
--- a/res/xml/accessibility_text_reading_options.xml
+++ b/res/xml/accessibility_text_reading_options.xml
@@ -33,7 +33,8 @@
         settings:iconEnd="@drawable/ic_add_24dp"
         settings:iconEndContentDescription="@string/font_size_make_larger_desc"
         settings:iconStart="@drawable/ic_remove_24dp"
-        settings:iconStartContentDescription="@string/font_size_make_smaller_desc"/>
+        settings:iconStartContentDescription="@string/font_size_make_smaller_desc"
+        settings:keywords="@string/keywords_font_size" />
 
     <com.android.settings.widget.LabeledSeekBarPreference
         android:key="display_size"
@@ -43,7 +44,8 @@
         settings:iconEnd="@drawable/ic_add_24dp"
         settings:iconEndContentDescription="@string/screen_zoom_make_larger_desc"
         settings:iconStart="@drawable/ic_remove_24dp"
-        settings:iconStartContentDescription="@string/screen_zoom_make_smaller_desc"/>
+        settings:iconStartContentDescription="@string/screen_zoom_make_smaller_desc"
+        settings:keywords="@string/keywords_display_size" />
 
     <SwitchPreference
         android:key="toggle_force_bold_text"