From 30cfc2553e405e27da0af56b8d7acc2ab616477f Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Thu, 15 Aug 2019 13:44:54 +0800 Subject: [PATCH] Use FooterPreference in xml explicitly Removed the FooterPreferenceMixin from the some accessibility pages. Fixes: 139455988 Test: manual test Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility Change-Id: Ia1568e0a120eede26fadc16764caef2ecfb2411a --- res/xml/accessibility_autoclick_settings.xml | 6 ++++++ res/xml/accessibility_daltonizer_settings.xml | 6 ++++++ res/xml/accessibility_shortcut_settings.xml | 7 +++++++ .../AccessibilityShortcutPreferenceFragment.java | 5 ++--- .../ToggleAutoclickPreferenceFragment.java | 13 ++++++------- .../ToggleDaltonizerPreferenceFragment.java | 7 +++---- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml index bb77002868b..0351faf3066 100644 --- a/res/xml/accessibility_autoclick_settings.xml +++ b/res/xml/accessibility_autoclick_settings.xml @@ -16,6 +16,7 @@ @@ -24,4 +25,9 @@ android:key="autoclick_delay" android:title="@string/accessibility_autoclick_delay_preference_title" /> + diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml index 9cd38652c85..496c51571b9 100644 --- a/res/xml/accessibility_daltonizer_settings.xml +++ b/res/xml/accessibility_daltonizer_settings.xml @@ -16,6 +16,7 @@ @@ -27,4 +28,9 @@ android:title="@string/daltonizer_type" android:icon="@drawable/ic_accessibility_illustration_colorblind" /> + diff --git a/res/xml/accessibility_shortcut_settings.xml b/res/xml/accessibility_shortcut_settings.xml index 12450509c06..f431dec1e5c 100644 --- a/res/xml/accessibility_shortcut_settings.xml +++ b/res/xml/accessibility_shortcut_settings.xml @@ -14,6 +14,7 @@ limitations under the License. --> + + \ No newline at end of file diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index de65324f388..cd13875b57f 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -80,8 +80,6 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer ((Boolean) o) ? 1 : 0); return true; }); - mFooterPreferenceMixin.createFooterPreference() - .setTitle(R.string.accessibility_shortcut_description); } @Override @@ -186,7 +184,8 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer return getServiceInfo(context) != null; } - private static @Nullable ComponentName getShortcutComponent(Context context) { + private static @Nullable + ComponentName getShortcutComponent(Context context) { String componentNameString = AccessibilityUtils.getShortcutTargetServiceComponentNameString( context, UserHandle.myUserId()); if (componentNameString == null) return null; diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 8e12339f793..49f752e2991 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -77,8 +77,9 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr /** * Gets string that should be used as a autoclick preference summary for provided autoclick * delay. + * * @param resources Resources from which string should be retrieved. - * @param delay Delay for whose value summary should be retrieved. + * @param delay Delay for whose value summary should be retrieved. */ static CharSequence getAutoclickPreferenceSummary(Resources resources, int delay) { int summaryIndex = getAutoclickPreferenceSummaryIndex(delay); @@ -136,8 +137,6 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr mDelay.setMax(delayToSeekBarProgress(MAX_AUTOCLICK_DELAY)); mDelay.setProgress(delayToSeekBarProgress(delay)); mDelay.setOnPreferenceChangeListener(this); - mFooterPreferenceMixin.createFooterPreference() - .setTitle(R.string.accessibility_autoclick_description); } @Override @@ -166,11 +165,11 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr public boolean onPreferenceChange(Preference preference, Object newValue) { if (preference == mDelay && newValue instanceof Integer) { Settings.Secure.putInt(getContentResolver(), - Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY, - seekBarProgressToDelay((int)newValue)); + Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY, + seekBarProgressToDelay((int) newValue)); return true; - } - return false; + } + return false; } /** diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 892489974a2..e307e9bfbe7 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -43,6 +43,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED; private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER; private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY; + private static final String KEY_DALTONIZER_FOOTER = "daltonizer_footer"; private ListPreference mType; @@ -62,10 +63,8 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF mType = (ListPreference) findPreference("type"); - if (!ColorDisplayManager.isColorTransformAccelerated(getActivity())) { - mFooterPreferenceMixin.createFooterPreference().setTitle( - R.string.accessibility_display_daltonizer_preference_subtitle); - } + final Preference footer = findPreference(KEY_DALTONIZER_FOOTER); + footer.setVisible(!ColorDisplayManager.isColorTransformAccelerated(getActivity())); initPreferences(); }