summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-07-15 21:28:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-07-15 21:28:34 +0000
commit9a0e444c22dbac37ba5be28eef1e7f3b40aabbb6 (patch)
tree3535805dcb858c38e3dfe6ce8ba1060b6c4277ef
parent37018626c9013fcf743288b54c2150d9575a4c30 (diff)
parentfc47ba75e47bae52894aa7d973470e544f9dc2bd (diff)
Merge "Back up Night Light settings" into nyc-mr1-dev
-rwxr-xr-xcore/java/android/provider/Settings.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 765a3a8cd9d4..3eb2ac3dc6ca 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6380,7 +6380,11 @@ public final class Settings {
PREFERRED_TTY_MODE,
ENHANCED_VOICE_PRIVACY_ENABLED,
TTY_MODE_ENABLED,
- INCALL_POWER_BUTTON_BEHAVIOR
+ INCALL_POWER_BUTTON_BEHAVIOR,
+ NIGHT_DISPLAY_CUSTOM_START_TIME,
+ NIGHT_DISPLAY_CUSTOM_END_TIME,
+ NIGHT_DISPLAY_AUTO_MODE,
+ NIGHT_DISPLAY_ACTIVATED
};
/**