Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5ebdd8d authored by Justin Klaassen's avatar Justin Klaassen Committed by android-build-merger
Browse files

Merge \\"Add SETTINGS_CONDITION_NIGHT_DISPLAY\\" into nyc-mr1-dev am: 1e6e1ffe

am: 7b330a1f

Change-Id: I46bebb5f6b267df5bcd69a03a98b24a61a6a41a7
parents aa5df000 7b330a1f
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -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 ----

    // ------- Begin N Keyboard Shortcuts Helper -----