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

Commit a67bb943 authored by Daniel Hsieh's avatar Daniel Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Hide following typing preference setting in SuW."

parents 32420a07 6542b6ef

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

+7 −5
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
    private DialogCreatable mDialogDelegate;

    private MagnificationFollowTypingPreferenceController mFollowTypingPreferenceController;



    protected SwitchPreference mFollowingTypingSwitchPreference;



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -178,15 +180,15 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
        getSettingsLifecycle().addObserver(magnificationModePreferenceController);

        magnificationModePreferenceController.displayPreference(getPreferenceScreen());



        final SwitchPreference followingTypingSwitchPreference =

        mFollowingTypingSwitchPreference =

                new SwitchPreference(getPrefContext());

        followingTypingSwitchPreference.setTitle(

        mFollowingTypingSwitchPreference.setTitle(

                R.string.accessibility_screen_magnification_follow_typing_title);

        followingTypingSwitchPreference.setSummary(

        mFollowingTypingSwitchPreference.setSummary(

                R.string.accessibility_screen_magnification_follow_typing_summary);

        followingTypingSwitchPreference.setKey(

        mFollowingTypingSwitchPreference.setKey(

                MagnificationFollowTypingPreferenceController.PREF_KEY);

        generalCategory.addPreference(followingTypingSwitchPreference);

        generalCategory.addPreference(mFollowingTypingSwitchPreference);



        mFollowTypingPreferenceController = new MagnificationFollowTypingPreferenceController(

                getContext(), MagnificationFollowTypingPreferenceController.PREF_KEY);

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

+9 −1
Original line number Diff line number Diff line
@@ -44,9 +44,17 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard 
        final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);

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

                description, icon);

        hidePreferenceSettingComponents();

    }



        // Hide the setting from the vision settings.

    /**

     * Hide the magnification preference settings in the SuW's vision settings.

     */

    private void hidePreferenceSettingComponents() {

        // Setting of magnification type

        mSettingsPreference.setVisible(false);

        // Setting of following typing

        mFollowingTypingSwitchPreference.setVisible(false);

    }



    @Override