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

Commit a28e8089 authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Replace Magnification preview" into main

parents f2c66a8a 88414d4e

res-product/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    <item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>



    <item name="a11y_magnification_banner" type="raw" product="default">@raw/accessibility_magnification_banner</item>

    <item name="a11y_magnification_banner" type="raw" product="tablet">@raw/accessibility_magnification_banner_tablet</item>



    <item name="a11y_extra_dim_banner" type="raw" product="default">@raw/extra_dim_banner</item>

    <item name="a11y_extra_dim_banner" type="raw" product="tablet">@raw/extra_dim_banner_tablet</item>

res/raw/accessibility_magnification_banner.json

+3110 −3216

File changed.

Preview size limit exceeded, changes collapsed.

res/raw/accessibility_magnification_banner_tablet.json

deleted100644 → 0
+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType; 
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;

import com.android.settings.utils.LocaleUtils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.widget.IllustrationPreference;



import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -130,6 +131,11 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
    @Override

    public void onResume() {

        super.onResume();

        final IllustrationPreference illustrationPreference =

                getPreferenceScreen().findPreference(KEY_ANIMATED_IMAGE);

        if (illustrationPreference != null) {

            illustrationPreference.applyDynamicColor();

        }



        final AccessibilityManager am = getPrefContext().getSystemService(

                AccessibilityManager.class);