PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide following typing preference setting in SuW."

Browse Source
This commit is contained in:
Daniel Hsieh
2022-01-20 11:51:48 +00:00
committed by Android (Google) Code Review
parent 32420a07db 6542b6efb8
commit a67bb94388
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

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

10
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
View File

@@ -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