diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java index 5fc4cd21797..2cdbb332e0f 100644 --- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java @@ -234,6 +234,9 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment { final String htmlDescription = info.loadHtmlDescription(getActivity().getPackageManager()); extras.putString(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, htmlDescription); + final CharSequence intro = info.loadIntro(getActivity().getPackageManager()); + extras.putCharSequence(AccessibilitySettings.EXTRA_INTRO, intro); + // We will log nonA11yTool status from PolicyWarningUIController; others none. extras.putLong(AccessibilitySettings.EXTRA_TIME_FOR_LOGGING, getActivity().getIntent().getLongExtra( diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index e834640e678..6539f326734 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -94,6 +94,7 @@ public class AccessibilitySettings extends DashboardFragment { static final String EXTRA_TITLE_RES = "title_res"; static final String EXTRA_RESOLVE_INFO = "resolve_info"; static final String EXTRA_SUMMARY = "summary"; + static final String EXTRA_INTRO = "intro"; static final String EXTRA_SETTINGS_TITLE = "settings_title"; static final String EXTRA_COMPONENT_NAME = "component_name"; static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name"; @@ -570,14 +571,15 @@ public class AccessibilitySettings extends DashboardFragment { final String prefKey = preference.getKey(); final int imageRes = info.getAnimatedImageRes(); + final CharSequence intro = info.loadIntro(mPm); final CharSequence description = getServiceDescription(mContext, info, serviceEnabled); final String htmlDescription = info.loadHtmlDescription(mPm); final String settingsClassName = info.getSettingsActivityName(); final String tileServiceClassName = info.getTileServiceClassName(); - putBasicExtras(preference, prefKey, title, description, imageRes, htmlDescription, - componentName); + putBasicExtras(preference, prefKey, title, intro, description, imageRes, + htmlDescription, componentName); putServiceExtras(preference, resolveInfo, serviceEnabled); putSettingsExtras(preference, packageName, settingsClassName); putTileServiceExtras(preference, packageName, tileServiceClassName); @@ -630,14 +632,15 @@ public class AccessibilitySettings extends DashboardFragment { setRestrictedPreferenceEnabled(preference, permittedServices, serviceEnabled); final String prefKey = preference.getKey(); + final CharSequence intro = info.loadIntro(mPm); final String description = info.loadDescription(mPm); final int imageRes = info.getAnimatedImageRes(); final String htmlDescription = info.loadHtmlDescription(mPm); final String settingsClassName = info.getSettingsActivityName(); final String tileServiceClassName = info.getTileServiceClassName(); - putBasicExtras(preference, prefKey, title, description, imageRes, htmlDescription, - componentName); + putBasicExtras(preference, prefKey, title, intro, description, imageRes, + htmlDescription, componentName); putSettingsExtras(preference, componentName.getPackageName(), settingsClassName); putTileServiceExtras(preference, componentName.getPackageName(), tileServiceClassName); @@ -722,11 +725,12 @@ public class AccessibilitySettings extends DashboardFragment { /** Puts the basic extras into {@link RestrictedPreference}'s getExtras(). */ private void putBasicExtras(RestrictedPreference preference, String prefKey, - CharSequence title, CharSequence summary, int imageRes, String htmlDescription, - ComponentName componentName) { + CharSequence title, CharSequence intro, CharSequence summary, int imageRes, + String htmlDescription, ComponentName componentName) { final Bundle extras = preference.getExtras(); extras.putString(EXTRA_PREFERENCE_KEY, prefKey); extras.putCharSequence(EXTRA_TITLE, title); + extras.putCharSequence(EXTRA_INTRO, intro); extras.putCharSequence(EXTRA_SUMMARY, summary); extras.putParcelable(EXTRA_COMPONENT_NAME, componentName); extras.putInt(EXTRA_ANIMATED_IMAGE_RES, imageRes); diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 5ee455070db..5747d0a1101 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -392,6 +392,11 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference mHtmlDescription = arguments.getCharSequence( AccessibilitySettings.EXTRA_HTML_DESCRIPTION); } + + // Intro. + if (arguments.containsKey(AccessibilitySettings.EXTRA_INTRO)) { + mTopIntroTitle = arguments.getCharSequence(AccessibilitySettings.EXTRA_INTRO); + } } /** Customizes the order by preference key. */