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

Commit 6542b6ef authored by Daniel Hsieh's avatar Daniel Hsieh
Browse files

Hide following typing preference setting in SuW. 

Hide following typing switch preference setting in SuW.

Bug: 214876729
Test: Start set-up wizard > Assistive options > Vision settings >
           Magnification > Following typing preference is invisible
      make RunSettingsRoboTests ROBOTEST_FILTER=
           ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I4ab64deeef321390c5b89c8ea58ea469fb5c09bf
parent 55bc4986

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

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

    private DialogCreatable mDialogDelegate;

    private MagnificationFollowTypingPreferenceController mFollowTypingPreferenceController;

    private MagnificationFollowTypingPreferenceController mFollowTypingPreferenceController;





    protected SwitchPreference mFollowingTypingSwitchPreference;



    @Override

    @Override

    public void onCreate(Bundle savedInstanceState) {

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

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

        getSettingsLifecycle().addObserver(magnificationModePreferenceController);

        magnificationModePreferenceController.displayPreference(getPreferenceScreen());

        magnificationModePreferenceController.displayPreference(getPreferenceScreen());





        final SwitchPreference followingTypingSwitchPreference =

        mFollowingTypingSwitchPreference =

                new SwitchPreference(getPrefContext());

                new SwitchPreference(getPrefContext());

        followingTypingSwitchPreference.setTitle(

        mFollowingTypingSwitchPreference.setTitle(

                R.string.accessibility_screen_magnification_follow_typing_title);

                R.string.accessibility_screen_magnification_follow_typing_title);

        followingTypingSwitchPreference.setSummary(

        mFollowingTypingSwitchPreference.setSummary(

                R.string.accessibility_screen_magnification_follow_typing_summary);

                R.string.accessibility_screen_magnification_follow_typing_summary);

        followingTypingSwitchPreference.setKey(

        mFollowingTypingSwitchPreference.setKey(

                MagnificationFollowTypingPreferenceController.PREF_KEY);

                MagnificationFollowTypingPreferenceController.PREF_KEY);

        generalCategory.addPreference(followingTypingSwitchPreference);

        generalCategory.addPreference(mFollowingTypingSwitchPreference);





        mFollowTypingPreferenceController = new MagnificationFollowTypingPreferenceController(

        mFollowTypingPreferenceController = new MagnificationFollowTypingPreferenceController(

                getContext(), MagnificationFollowTypingPreferenceController.PREF_KEY);

                getContext(), MagnificationFollowTypingPreferenceController.PREF_KEY);

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

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

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

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

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

                description, icon);

                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);

        mSettingsPreference.setVisible(false);

        // Setting of following typing

        mFollowingTypingSwitchPreference.setVisible(false);

    }

    }





    @Override

    @Override