From efb44b71739236a469d97aefb53e8b4179f61e11 Mon Sep 17 00:00:00 2001
From: Peter_Liang <peterliang@google.com>
Date: Tue, 25 Jan 2022 09:05:23 +0800
Subject: [PATCH] =?UTF-8?q?New=20feature=20=E2=80=9CText=20and=20reading?=
 =?UTF-8?q?=20options=E2=80=9D=20for=20SetupWizard,=20Wallpaper,=20and=20S?=
 =?UTF-8?q?ettings=20(16/n).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add the entry to "Anything else?" screen
1) Add the new activity-alias tag ".TextReadingForSetupWizardActivity", including the fragment class, action, and targetActivity.
2) Temporarily use the “DISPLAY_SETTINGS” category to trigger “.TextReadingForSetupWizardActivity” to ensure the backward compatibility.
3) Add the text reading settings page entry into SettingsGateway to be successfully launched from SuW.

Bug: 211503117
Test: manual test
Change-Id: I5c35df3c33c713342a7a0cfad786b7ae48ad941f
---
 AndroidManifest.xml                           | 24 ++++++++++++++++++-
 .../core/gateway/SettingsGateway.java         |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bf64ebe7b35..e0119396ff6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1951,7 +1951,6 @@
             android:targetActivity=".accessibility.AccessibilitySettingsForSetupWizardActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.DISPLAY_SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/vision_settings_suggestion_title" />
@@ -1961,6 +1960,29 @@
                 android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
         </activity-alias>
 
+        <activity-alias
+            android:name=".TextReadingForSetupWizardActivity"
+            android:exported="true"
+            android:icon="@drawable/ic_font_download"
+            android:targetActivity=".accessibility.AccessibilitySettingsForSetupWizardActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <!-- TODO(b/1352717): Consider replacing it with another category, temporarily
+                using an older one to avoid side problems. -->
+                <category android:name="com.android.settings.suggested.category.DISPLAY_SETTINGS" />
+            </intent-filter>
+
+            <meta-data
+                android:name="com.android.settings.title"
+                android:resource="@string/accessibility_text_reading_options_title" />
+            <meta-data
+                android:name="com.android.settings.icon_tintable"
+                android:value="true" />
+            <meta-data
+                android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard" />
+        </activity-alias>
+
         <activity
             android:name=".accessibility.AccessibilityScreenSizeForSetupWizardActivity"
             android:theme="@android:style/Theme.DeviceDefault.Settings"
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 2f0e8b3b4e2..ce3cab99572 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -29,6 +29,7 @@ import com.android.settings.accessibility.AccessibilityDetailsSettingsFragment;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
 import com.android.settings.accessibility.CaptionPropertiesFragment;
+import com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard;
 import com.android.settings.accessibility.ToggleColorInversionPreferenceFragment;
 import com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment;
 import com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment;
@@ -222,6 +223,7 @@ public class SettingsGateway {
             AccessibilityDetailsSettingsFragment.class.getName(),
             AccessibilitySettings.class.getName(),
             AccessibilitySettingsForSetupWizard.class.getName(),
+            TextReadingPreferenceFragmentForSetupWizard.class.getName(),
             CaptionPropertiesFragment.class.getName(),
             ToggleDaltonizerPreferenceFragment.class.getName(),
             ToggleColorInversionPreferenceFragment.class.getName(),