diff options
author | Saige McVea <saigem@google.com> | 2017-04-07 22:24:29 -0700 |
---|---|---|
committer | Saige McVea <saigem@google.com> | 2017-04-17 11:59:07 -0700 |
commit | 6a6b97905fc5561504362d9111322551aea5df5b (patch) | |
tree | 51c8d0cc73e0f518c606f2e38e335c92977017ee /src | |
parent | c2d56691feb8cd2cc2565f5342ff33fb32df8234 (diff) | |
download | packages_apps_Settings-6a6b97905fc5561504362d9111322551aea5df5b.tar.gz packages_apps_Settings-6a6b97905fc5561504362d9111322551aea5df5b.tar.bz2 packages_apps_Settings-6a6b97905fc5561504362d9111322551aea5df5b.zip |
Conditionally reposition experimental preferences.
Specifically, move colour inversion and colour correction preferences
to the display category if device is color transform accelerated.
Test: Manual
Bug: 36603386
Change-Id: I4f7e4e569f5f358e6e3c705f9df02e0da473a081
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilitySettings.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index ac618d08be..6152bc1462 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -549,6 +549,22 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } private void updateSystemPreferences() { + // Move color inversion and color correction preferences to Display category if device + // supports HWC hardware-accelerated color transform. + if (isColorTransformAccelerated(getContext())) { + PreferenceCategory experimentalCategory = + mCategoryToPrefCategoryMap.get(CATEGORY_EXPERIMENTAL); + PreferenceCategory displayCategory = + mCategoryToPrefCategoryMap.get(CATEGORY_DISPLAY); + experimentalCategory.removePreference(mToggleInversionPreference); + experimentalCategory.removePreference(mDisplayDaltonizerPreferenceScreen); + mToggleInversionPreference.setOrder(mToggleLargePointerIconPreference.getOrder()); + mDisplayDaltonizerPreferenceScreen.setOrder(mToggleInversionPreference.getOrder()); + mToggleInversionPreference.setSummary(R.string.summary_empty); + displayCategory.addPreference(mToggleInversionPreference); + displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen); + } + // Text contrast. mToggleHighTextContrastPreference.setChecked( Settings.Secure.getInt(getContentResolver(), @@ -600,6 +616,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen); } + private boolean isColorTransformAccelerated(Context context) { + return context.getResources() + .getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated); + } + private void updateMagnificationSummary(Preference pref) { final boolean tripleTapEnabled = Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1; |