Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efb44b71 authored by Peter_Liang's avatar Peter_Liang
Browse files

New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (16/n). 

- 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
parent 0ee078d3

AndroidManifest.xml

+23 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -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(),