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

Commit 93ae564e authored by Doris Ling's avatar Doris Ling
Browse files

resolve merge conflicts of 09c511f0 to master 

Change-Id: I816f248822cb787f5ce35f3184def0f1fe45169e
parents 20198d05 09c511f0

proto/src/metrics_constants.proto

+5 −1
Original line number Diff line number Diff line
@@ -2239,9 +2239,13 @@ message MetricsEvent { 
    // CATEGORY: SETTINGS

    STORAGE_MANAGER_SETTINGS = 458;



    // OPEN: Settings -> Gestures

    // CATEGORY: SETTINGS

    SETTINGS_GESTURES = 459;



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

    // Keyboard Shortcuts Helper is opened/closed.

    KEYBOARD_SHORTCUTS_HELPER = 459;

    KEYBOARD_SHORTCUTS_HELPER = 460;



    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS