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

Commit 87e9c685 authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

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

parents d920ad50 efb44b71

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(),