Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14

Browse Source 
am: 1228803cde

Change-Id: I855bf48a271b15f671957b1451caab24d08d8293
This commit is contained in:
Justin Klaassen
2016-07-08 21:46:23 +00:00
committed by android-build-merger
parent 6d5c9de640 1228803cde
commit 029c2f4e3f
8 changed files with 842 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/provider/Settings.java
View File

@@ -6150,6 +6150,30 @@ public final class Settings {
"camera_double_tap_power_gesture_disabled";
/**
* Control whether Night display is currently activated.
* @hide
*/
public static final String NIGHT_DISPLAY_ACTIVATED = "night_display_activated";
/**
* Control whether Night display will automatically activate/deactivate.
* @hide
*/
public static final String NIGHT_DISPLAY_AUTO_MODE = "night_display_auto_mode";
/**
* Custom time when Night display is scheduled to activate.
* Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
* @hide
*/
public static final String NIGHT_DISPLAY_CUSTOM_START_TIME = "night_display_custom_start_time";
/**
* Custom time when Night display is scheduled to deactivate.
* Represented as milliseconds from midnight (e.g. 21600000 == 6am).
* @hide
*/
public static final String NIGHT_DISPLAY_CUSTOM_END_TIME = "night_display_custom_end_time";
/**
* Behavior of twilight on the device.