Merge changes I72d65c73,Icc998925
* changes:
Add Reduce Bright Color Settings to proto files
Add Reduce Bright Colors to Settings
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4ff0638..87334d5 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -327,6 +327,21 @@
"android.settings.ACCESSIBILITY_DETAILS_SETTINGS";
/**
+ * Activity Action: Show settings to allow configuration of Reduce Bright Colors.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you
+ * safeguard against this.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_REDUCE_BRIGHT_COLORS_SETTINGS =
+ "android.settings.REDUCE_BRIGHT_COLORS_SETTINGS";
+
+ /**
* Activity Action: Show settings to control access to usage information.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
@@ -7124,6 +7139,33 @@
public static final String ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS =
"accessibility_interactive_ui_timeout_ms";
+
+ /**
+ * Setting that specifies whether Reduce Bright Colors, or brightness dimming by color
+ * adjustment, is enabled.
+ *
+ * @hide
+ */
+ public static final String REDUCE_BRIGHT_COLORS_ACTIVATED =
+ "reduce_bright_colors_activated";
+
+ /**
+ * Setting that specifies the level of Reduce Bright Colors in intensity. The range is
+ * [0, 100].
+ *
+ * @hide
+ */
+ public static final String REDUCE_BRIGHT_COLORS_LEVEL =
+ "reduce_bright_colors_level";
+
+ /**
+ * Setting that specifies whether Reduce Bright Colors should persist across reboots.
+ *
+ * @hide
+ */
+ public static final String REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS =
+ "reduce_bright_colors_persist_across_reboots";
+
/**
* List of the enabled print services.
*
diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto
index e1a980c..83c5391 100644
--- a/core/proto/android/providers/settings/secure.proto
+++ b/core/proto/android/providers/settings/secure.proto
@@ -452,6 +452,15 @@
}
optional QuickSettings qs = 45;
+ message ReduceBrightColors {
+ option (android.msg_privacy).dest = DEST_EXPLICIT;
+
+ optional SettingProto activated = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ optional SettingProto level = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ optional SettingProto persist_across_reboots = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ }
+ optional ReduceBrightColors reduce_bright_colors = 87;
+
message Rotation {
option (android.msg_privacy).dest = DEST_EXPLICIT;
@@ -625,5 +634,5 @@
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
- // Next tag = 87;
+ // Next tag = 88;
}
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
index 4db61b0..a19761a 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
@@ -60,6 +60,8 @@
Settings.Secure.ACCESSIBILITY_CAPTIONING_TYPEFACE,
Settings.Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
Settings.Secure.ACCESSIBILITY_CAPTIONING_WINDOW_COLOR,
+ Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL,
+ Settings.Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS,
Settings.Secure.TTS_DEFAULT_RATE,
Settings.Secure.TTS_DEFAULT_PITCH,
Settings.Secure.TTS_DEFAULT_SYNTH,
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
index 1fde40c..27c2564 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
@@ -29,6 +29,7 @@
import static android.provider.settings.validators.SettingsValidators.NON_NEGATIVE_INTEGER_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.NULLABLE_COMPONENT_NAME_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.PACKAGE_NAME_VALIDATOR;
+import static android.provider.settings.validators.SettingsValidators.PERCENTAGE_INTEGER_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.TILE_LIST_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.TTS_LIST_VALIDATOR;
@@ -101,6 +102,8 @@
Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
new InclusiveFloatRangeValidator(0.5f, 2.0f));
VALIDATORS.put(Secure.ACCESSIBILITY_CAPTIONING_WINDOW_COLOR, ANY_INTEGER_VALIDATOR);
+ VALIDATORS.put(Secure.REDUCE_BRIGHT_COLORS_LEVEL, PERCENTAGE_INTEGER_VALIDATOR);
+ VALIDATORS.put(Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.TTS_DEFAULT_RATE, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(Secure.TTS_DEFAULT_PITCH, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(Secure.TTS_DEFAULT_SYNTH, PACKAGE_NAME_VALIDATOR);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 506b608..f1fb527 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2343,6 +2343,18 @@
SecureSettingsProto.QuickSettings.AUTO_ADDED_TILES);
p.end(qsToken);
+ final long reduceBrightColorsToken = p.start(SecureSettingsProto.REDUCE_BRIGHT_COLORS);
+ dumpSetting(s, p,
+ Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,
+ SecureSettingsProto.ReduceBrightColors.ACTIVATED);
+ dumpSetting(s, p,
+ Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL,
+ SecureSettingsProto.ReduceBrightColors.LEVEL);
+ dumpSetting(s, p,
+ Settings.Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS,
+ SecureSettingsProto.ReduceBrightColors.PERSIST_ACROSS_REBOOTS);
+ p.end(reduceBrightColorsToken);
+
final long rotationToken = p.start(SecureSettingsProto.ROTATION);
dumpSetting(s, p,
Settings.Secure.SHOW_ROTATION_SUGGESTIONS,
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 34b7298..a9843dc 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -745,7 +745,8 @@
Settings.Secure.NEARBY_SHARING_COMPONENT, // not user configurable
Settings.Secure.WINDOW_MAGNIFICATION,
Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_MAGNIFICATION_CONTROLLER,
- Settings.Secure.SUPPRESS_DOZE);
+ Settings.Secure.SUPPRESS_DOZE,
+ Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED);
@Test
public void systemSettingsBackedUpOrDenied() {