From 6490923251f80f51164d037a79c8855067c6b9f4 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Tue, 17 Jul 2018 10:15:19 +0800 Subject: [PATCH] Change the order of preferences in a11y Some preference items have the same order, and it makes these items be sorted in different position per languages. Use unique order for each items instead. Bug: 77949267 Test: atest CtsAccessibilityTestCases Test: manual check the order in different languages Change-Id: Ibfcb316c4299266b053053d9d88819a7dcc158fa --- .../settings/accessibility/AccessibilitySettings.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index b910130a219..22cff3eb7e4 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -633,8 +633,14 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements mCategoryToPrefCategoryMap.get(CATEGORY_DISPLAY); experimentalCategory.removePreference(mToggleInversionPreference); experimentalCategory.removePreference(mDisplayDaltonizerPreferenceScreen); - mToggleInversionPreference.setOrder(mToggleLargePointerIconPreference.getOrder()); - mDisplayDaltonizerPreferenceScreen.setOrder(mToggleInversionPreference.getOrder()); + mDisplayDaltonizerPreferenceScreen.setOrder( + mDisplayMagnificationPreferenceScreen.getOrder() + 1); + mToggleInversionPreference.setOrder( + mDisplayDaltonizerPreferenceScreen.getOrder() + 1); + mToggleLargePointerIconPreference.setOrder( + mToggleInversionPreference.getOrder() + 1); + mToggleDisableAnimationsPreference.setOrder( + mToggleLargePointerIconPreference.getOrder() + 1); mToggleInversionPreference.setSummary(R.string.summary_empty); displayCategory.addPreference(mToggleInversionPreference); displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);