Fix two intro strings for Magnification page during Suw
- Keep the SuW intro and hide the setting intro
Bug: 220025399
Test: Manual testing
Change-Id: Ie4e9eace8dbd638bd141c14a22603644d93d458a
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 5747d0a..8ee7c8d 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -78,6 +78,7 @@
public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment
implements ShortcutPreference.OnClickCallback, OnMainSwitchChangeListener {
+ protected TopIntroPreference mTopIntroPreference;
protected SettingsMainSwitchPreference mToggleServiceSwitchPreference;
protected ShortcutPreference mShortcutPreference;
protected Preference mSettingsPreference;
@@ -476,10 +477,10 @@
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 d92fd51..cb5ca75 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -40,7 +40,7 @@
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 @@
* 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 7adddf9..f9a1113 100644
--- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -46,6 +46,9 @@
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 b5c1123..a460419 100644
--- a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
@@ -46,6 +46,9 @@
description, icon);
mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
+ if (mTopIntroPreference != null) {
+ mTopIntroPreference.setVisible(false);
+ }
}
@Override