Merge "fix(magnification suw): followTyping preference should be hidden in magnification suw page" into main

This commit is contained in:
Roy Chou
2024-05-02 05:44:58 +00:00
committed by Android (Google) Code Review

View File

@@ -91,7 +91,6 @@ public class ToggleScreenMagnificationPreferenceFragment extends
private CheckBox mTripleTapTypeCheckBox; private CheckBox mTripleTapTypeCheckBox;
@Nullable private CheckBox mTwoFingerTripleTapTypeCheckBox; @Nullable private CheckBox mTwoFingerTripleTapTypeCheckBox;
private DialogCreatable mDialogDelegate; private DialogCreatable mDialogDelegate;
private MagnificationFollowTypingPreferenceController mFollowTypingPreferenceController;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -241,14 +240,14 @@ public class ToggleScreenMagnificationPreferenceFragment extends
} }
private void addFollowTypingSetting(PreferenceCategory generalCategory) { private void addFollowTypingSetting(PreferenceCategory generalCategory) {
var followTypingSwitchPreference = new SwitchPreferenceCompat(getPrefContext()); mFollowingTypingSwitchPreference = new SwitchPreferenceCompat(getPrefContext());
followTypingSwitchPreference.setTitle( mFollowingTypingSwitchPreference.setTitle(
R.string.accessibility_screen_magnification_follow_typing_title); R.string.accessibility_screen_magnification_follow_typing_title);
followTypingSwitchPreference.setSummary( mFollowingTypingSwitchPreference.setSummary(
R.string.accessibility_screen_magnification_follow_typing_summary); R.string.accessibility_screen_magnification_follow_typing_summary);
followTypingSwitchPreference.setKey( mFollowingTypingSwitchPreference.setKey(
MagnificationFollowTypingPreferenceController.PREF_KEY); MagnificationFollowTypingPreferenceController.PREF_KEY);
generalCategory.addPreference(followTypingSwitchPreference); generalCategory.addPreference(mFollowingTypingSwitchPreference);
var followTypingPreferenceController = new MagnificationFollowTypingPreferenceController( var followTypingPreferenceController = new MagnificationFollowTypingPreferenceController(
getContext(), MagnificationFollowTypingPreferenceController.PREF_KEY); getContext(), MagnificationFollowTypingPreferenceController.PREF_KEY);