Merge \"Back up Night Light settings\" into nyc-mr1-dev

am: 9a0e444c22 Change-Id: I4bc968dfced4671fecb140c50ce759b02d78c4a1
2016-07-15 21:33:57 +00:00
parent eb9b6ed05e 9a0e444c22
commit d4584a8fb5
1 changed files with 5 additions and 1 deletions
--- 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
        };

        /**