diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 5992ceb1c1c..05b21d8a841 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -79,6 +79,7 @@ import java.util.Locale; public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment implements ShortcutPreference.OnClickCallback, OnMainSwitchChangeListener { + protected TopIntroPreference mTopIntroPreference; protected SettingsMainSwitchPreference mToggleServiceSwitchPreference; protected ShortcutPreference mShortcutPreference; protected Preference mSettingsPreference; @@ -483,10 +484,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference if (TextUtils.isEmpty(mTopIntroTitle)) { return; } - final TopIntroPreference topIntroPreference = new TopIntroPreference(getPrefContext()); - topIntroPreference.setKey(KEY_TOP_INTRO_PREFERENCE); - topIntroPreference.setTitle(mTopIntroTitle); - getPreferenceScreen().addPreference(topIntroPreference); + mTopIntroPreference = new TopIntroPreference(getPrefContext()); + mTopIntroPreference.setKey(KEY_TOP_INTRO_PREFERENCE); + mTopIntroPreference.setTitle(mTopIntroTitle); + getPreferenceScreen().addPreference(mTopIntroPreference); } private void initToggleServiceSwitchPreference() { diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java index d92fd510056..cb5ca759df1 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -40,7 +40,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard final String title = getContext().getString( R.string.accessibility_screen_magnification_title); final String description = getContext().getString( - R.string.accessibility_preference_magnification_summary); + R.string.accessibility_screen_magnification_intro_text); final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility); AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title, description, icon); @@ -51,6 +51,8 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard * Hide the magnification preference settings in the SuW's vision settings. */ private void hidePreferenceSettingComponents() { + // Intro + mTopIntroPreference.setVisible(false); // Setting of magnification type mSettingsPreference.setVisible(false); // Setting of following typing diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java index 7adddf9a3ab..f9a1113c054 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -46,6 +46,9 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard description, icon); mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked(); + if (mTopIntroPreference != null) { + mTopIntroPreference.setVisible(false); + } } @Override diff --git a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java index b5c11233ac2..a4604191b81 100644 --- a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java @@ -46,6 +46,9 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard description, icon); mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked(); + if (mTopIntroPreference != null) { + mTopIntroPreference.setVisible(false); + } } @Override