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

Commit 882f4e1f authored by Shaotang Li's avatar Shaotang Li
Browse files

resolve merge conflicts of b825510b to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I3dd8e3f70d648fc37811d80f4f1356687a4df1b8
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
parents 62ced9c2 b825510b

proto/src/metrics_constants.proto

+53 −0
Original line number Diff line number Diff line
@@ -6129,6 +6129,59 @@ message MetricsEvent { 
    // CATEGORY: NOTIFICATION

    NOTIFICATION_INTERRUPTION = 1501;



    // OPEN: Emergency dialer opened

    // CLOSE: Emergency dialer closed

    //  SUBTYPE: The entry type that user opened emergency dialer

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    EMERGENCY_DIALER = 1558;



    // FIELD: The screen is currently locked

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_IS_SCREEN_LOCKED = 1559;



    // FIELD: Bit flag indicating the actions performed by user

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_USER_ACTIONS = 1560;



    // FIELD: The duration user stayed at emergency dialer

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_DURATION_MS = 1561;



    // ACTION: Making call via emergency dialer

    //  SUBTYPE: The UI that user made phone call

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    EMERGENCY_DIALER_MAKE_CALL = 1562;



    // FIELD: The phone number type of a call user made

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_PHONE_NUMBER_TYPE = 1563;



    // FIELD: There is a shortcut for the phone number

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_PHONE_NUMBER_HAS_SHORTCUT = 1564;



    // FIELD: The phone is in pocket while using emergency dialer

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_IN_POCKET = 1565;



    // ACTION: The second tap on emergency shortcut to make a phone call

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    EMERGENCY_DIALER_SHORTCUT_CONFIRM_TAP = 1566;



    // FIELD: The time in milliseconds of second tap on shortcut since first tap

    // CATEGORY: EMERGENCY_DIALER

    // OS: Q

    FIELD_EMERGENCY_DIALER_SHORTCUT_TAPS_INTERVAL = 1567;



    // ---- End Q Constants, all Q constants go above this line ----



    // Add new aosp constants above this line.