summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorSalvador Martinez <dehboxturtle@google.com>2019-05-03 18:31:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-03 18:31:08 +0000
commit49d35968e638284dbe9e448f4ae780df41fdd694 (patch)
treea28671ab101581bb90a697e5b9084354ead7f295 /core/java
parentc9b5dfcf806e89f37c85b733dcafbd3a76549114 (diff)
parentc500b2741e31ce52356ff66e3b4943a98ae3ff8c (diff)
Merge "Prevent dark mode backup from applying in before setup" into qt-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 75b40fd489f2..7c5a1fb5f787 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7762,6 +7762,9 @@ public final class Settings {
*/
public static final String UI_NIGHT_MODE = "ui_night_mode";
+ private static final Validator UI_NIGHT_MODE_VALIDATOR =
+ new SettingsValidators.InclusiveIntegerRangeValidator(0, 2);
+
/**
* Whether screensavers are enabled.
* @hide
@@ -8908,6 +8911,7 @@ public final class Settings {
ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS,
NOTIFICATION_NEW_INTERRUPTION_MODEL,
TRUST_AGENTS_EXTEND_UNLOCK,
+ UI_NIGHT_MODE,
LOCK_SCREEN_WHEN_TRUST_LOST,
SKIP_GESTURE,
SILENCE_GESTURE,
@@ -9101,6 +9105,7 @@ public final class Settings {
VALIDATORS.put(SILENCE_NOTIFICATION_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);
VALIDATORS.put(DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);
+ VALIDATORS.put(UI_NIGHT_MODE, UI_NIGHT_MODE_VALIDATOR);
}
/**