diff options
5 files changed, 18 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index dd93972820c0..6ad7422cfff0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9020,6 +9020,16 @@ public final class Settings { "accessibility_display_daltonizer"; /** + * Integer property that determines the saturation level of color correction. Default value + * is defined in Settings config.xml. + * [0-10] inclusive where 0 would look as if color space adustment is not applied at all. + * + * @hide + */ + public static final String ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL = + "accessibility_display_daltonizer_saturation_level"; + + /** * Setting that specifies whether automatic click when the mouse pointer stops moving is * enabled. * diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index 5ae365cc92b4..f5bbbb4dc0a1 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -103,6 +103,7 @@ message SecureSettingsProto { optional SettingProto accessibility_pinch_to_zoom_anywhere_enabled = 55 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto accessibility_single_finger_panning_enabled = 56 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto accessibility_floating_menu_targets = 57 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto display_daltonizer_saturation_level = 58 [ (android.privacy).dest = DEST_AUTOMATIC ]; } optional Accessibility accessibility = 2; diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index a33c160924e7..75c0cec1ad72 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -272,6 +272,7 @@ public class SecureSettings { Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS, Settings.Secure.AUDIO_DEVICE_INVENTORY, Settings.Secure.SCREEN_RESOLUTION_MODE, - Settings.Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS + Settings.Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS, + Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 1bff59289326..8faf917cadc2 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -430,5 +430,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.AUDIO_DEVICE_INVENTORY, ANY_STRING_VALIDATOR); VALIDATORS.put(Secure.SCREEN_RESOLUTION_MODE, new InclusiveIntegerRangeValidator( Secure.RESOLUTION_MODE_UNKNOWN, Secure.RESOLUTION_MODE_FULL)); + VALIDATORS.put(Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL, + new InclusiveIntegerRangeValidator(0, 10)); } } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 46cee6b1cc0a..fa9b279581c9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1760,6 +1760,9 @@ class SettingsProtoDumpUtil { Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, SecureSettingsProto.Accessibility.DISPLAY_DALTONIZER); dumpSetting(s, p, + Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL, + SecureSettingsProto.Accessibility.DISPLAY_DALTONIZER_SATURATION_LEVEL); + dumpSetting(s, p, Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, SecureSettingsProto.Accessibility.DISPLAY_INVERSION_ENABLED); dumpSetting(s, p, |