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

Commit 165f4ea7 authored by Daniel Norman's avatar Daniel Norman
Browse files

feat(expressive): Add new magnification banner for expressive design 

Fix: 378876803
Flag: EXEMPT custom flagging helpers from Settings and Setup
Test: observe new image; see bug screenshots
Change-Id: I3654563352e223af1a0d679318da45da2b4bc8be
parent 69c4f2df

res/raw/accessibility_magnification_banner_expressive.json

0 → 100644
+2350 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+8 −1
Original line number Diff line number Diff line
@@ -62,8 +62,10 @@ import com.android.settingslib.search.Indexable; 
import com.android.settingslib.search.SearchIndexable;

import com.android.settingslib.search.SearchIndexableRaw;

import com.android.settingslib.widget.IllustrationPreference;

import com.android.settingslib.widget.SettingsThemeHelper;



import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.util.ThemeHelper;



import java.util.ArrayList;

import java.util.List;
@@ -113,9 +115,14 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,

            @NonNull Bundle savedInstanceState) {

        mFeatureName = getString(R.string.accessibility_screen_magnification_title);

        final boolean useExpressiveTheme = WizardManagerHelper.isAnySetupWizard(getIntent())

                ? ThemeHelper.shouldApplyGlifExpressiveStyle(getPrefContext())

                : SettingsThemeHelper.isExpressiveTheme(getPrefContext());

        mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)

                .authority(getPrefContext().getPackageName())

                .appendPath(String.valueOf(R.raw.a11y_magnification_banner))

                .appendPath(String.valueOf(useExpressiveTheme

                        ? R.raw.accessibility_magnification_banner_expressive

                        : R.raw.a11y_magnification_banner))

                .build();

        mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {

            mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));