From 8eef6edfc16af8fd5dceab71b4c0ce327bb609d8 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Wed, 14 Aug 2019 16:53:47 +0800 Subject: [PATCH] Use FooterPreference in xml explicitly Removed the FooterPreferenceMixin from the ToggleFeaturePreferenceFragment page. Fixes: 139400387 Test: manual test Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility Change-Id: I8a61ddf2be500e3dc3b1a9503a7a671a5538c537 --- .../ToggleFeaturePreferenceFragment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 1feef01b256..314a577f216 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -29,6 +29,7 @@ import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; +import com.android.settingslib.widget.FooterPreference; public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment { @@ -138,11 +139,17 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference // Summary. if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY_RES)) { final int summary = arguments.getInt(AccessibilitySettings.EXTRA_SUMMARY_RES); - mFooterPreferenceMixin.createFooterPreference().setTitle(getText(summary)); + createFooterPreference(getText(summary)); } else if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) { final CharSequence summary = arguments.getCharSequence( AccessibilitySettings.EXTRA_SUMMARY); - mFooterPreferenceMixin.createFooterPreference().setTitle(summary); + createFooterPreference(summary); } } + + private void createFooterPreference(CharSequence title) { + final PreferenceScreen preferenceScreen = getPreferenceScreen(); + preferenceScreen.addPreference(new FooterPreference.Builder(getActivity()).setTitle( + title).build()); + } }