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

Commit 6001f869 authored by Menghan Li's avatar Menghan Li Committed by Automerger Merge Worker
Browse files

Merge "Fix Settings app crashes when clicked on the magnification" into sc-v2-dev am: 6de9b248 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16044202

Change-Id: I9fdf101e209d7ade30c3da5850ed4499d7fcca3d
parents 25b66298 6de9b248

res/values-night/themes_suw.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 


<!-- SUW related themes -->

<resources>

    <!-- This theme was applied to Settings pages which are running under SUW. -->

    <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3" />



    <!-- DayNight themes -->

    <style name="GlifTheme.DayNight" parent="GlifTheme" />

    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />

res/values/themes_suw.xml

+0 −3
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ 
        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

    </style>



    <!-- This theme was applied to Settings pages which are running under SUW. -->

    <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />



    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->

    <style name="SudDynamicColorThemeSettings.SetupWizard" parent="SudDynamicColorThemeGlifV3.Light">

        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>

res/xml/accessibility_settings_for_setup_wizard.xml

+2 −3
Original line number Diff line number Diff line
@@ -35,12 +35,11 @@ 
        settings:controller="com.android.settings.accessibility.ScreenSizePreferenceController" />



    <Preference

        android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"

        android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard"

        android:key="screen_magnification_preference"

        android:icon="@drawable/ic_accessibility_magnification"

        android:summary="@string/accessibility_preference_magnification_summary"

        android:title="@string/accessibility_screen_magnification_title"

        settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>

        android:title="@string/accessibility_screen_magnification_title" />



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard"

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard 
        final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;

        final String title = getContext().getString(

                R.string.accessibility_screen_magnification_title);

        final String description = getContext().getString(R.string.accelerometer_title);

        final String description = getContext().getString(

                R.string.accessibility_preference_magnification_summary);

        final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);

        AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,

                description, icon);

src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard 


        final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;

        final String title = getArguments().getString(AccessibilitySettings.EXTRA_TITLE);

        final String description = getContext().getString(

                R.string.accessibility_screen_magnification_title);

        final String description = getContext().getString(R.string.talkback_summary);

        final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);

        AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,

                description, icon);