PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Conditionally reposition experimental preferences." into oc-dev

Browse Source
This commit is contained in:
Saige McVea
2017-04-18 21:47:25 +00:00
committed by Android (Google) Code Review
parent a88635f5a3 6a6b97905f
commit b18e31bc5a
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/accessibility_settings.xml
View File

@@ -57,11 +57,6 @@
android:title="@string/accessibility_screen_magnification_title" android:title="@string/accessibility_screen_magnification_title"
android:icon="@mipmap/ic_accessibility_magnification" /> android:icon="@mipmap/ic_accessibility_magnification" />
<Preference
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
android:key="daltonizer_preference_screen"
android:title="@string/accessibility_display_daltonizer_preference_title" />
<SwitchPreference <SwitchPreference
android:key="toggle_large_pointer_icon" android:key="toggle_large_pointer_icon"
android:title="@string/accessibility_toggle_large_pointer_icon_title" /> android:title="@string/accessibility_toggle_large_pointer_icon_title" />
@@ -118,6 +113,11 @@
android:key="toggle_high_text_contrast_preference" android:key="toggle_high_text_contrast_preference"
android:title="@string/accessibility_toggle_high_text_contrast_preference_title" /> android:title="@string/accessibility_toggle_high_text_contrast_preference_title" />
<Preference
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
android:key="daltonizer_preference_screen"
android:title="@string/accessibility_display_daltonizer_preference_title" />
<SwitchPreference <SwitchPreference
android:key="toggle_inversion_preference" android:key="toggle_inversion_preference"
android:title="@string/accessibility_display_inversion_preference_title" android:title="@string/accessibility_display_inversion_preference_title"

21
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -550,6 +550,22 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} }
private void updateSystemPreferences() { 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. // Text contrast.
mToggleHighTextContrastPreference.setChecked( mToggleHighTextContrastPreference.setChecked(
Settings.Secure.getInt(getContentResolver(), Settings.Secure.getInt(getContentResolver(),
@@ -601,6 +617,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen); updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
} }
private boolean isColorTransformAccelerated(Context context) {
return context.getResources()
.getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated);
}
private void updateMagnificationSummary(Preference pref) { private void updateMagnificationSummary(Preference pref) {
final boolean tripleTapEnabled = Settings.Secure.getInt(getContentResolver(), final boolean tripleTapEnabled = Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1; Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;