Merge \"Add SETTINGS_CONDITION_NIGHT_DISPLAY\" into nyc-mr1-dev

am: 1e6e1ffeaa

Change-Id: I0204b25d35585c39ebea8ab797f00e1c027b86c5
This commit is contained in:
Justin Klaassen
2016-07-20 01:06:36 +00:00
committed by android-build-merger

View File

@@ -2177,7 +2177,7 @@ message MetricsEvent {
// CATEGORY: SETTINGS
ACTION_SUPPORT_DIAL_TOLLED = 487;
// OPEN: Settings > Display > Night display
// OPEN: Settings > Display > Night Light
// CATEGORY: SETTINGS
NIGHT_DISPLAY_SETTINGS = 488;
@@ -2188,12 +2188,15 @@ message MetricsEvent {
// Settings launched from collapsed quick settings.
ACTION_QS_COLLAPSED_SETTINGS_LAUNCH = 490;
// OPEN: QS Night mode tile shown
// ACTION: QS Night mode tile tapped
// OPEN: QS Night Light tile shown
// ACTION: QS Night Light tile tapped
// SUBTYPE: 0 is off, 1 is on
// CATEGORY: QUICK_SETTINGS
QS_NIGHT_DISPLAY = 491;
// Night Light on
SETTINGS_CONDITION_NIGHT_DISPLAY = 492;
// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS