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

Commit bff43509 authored by tmfang's avatar tmfang Committed by android-build-merger
Browse files

Merge "Add logging enums for slice converter exceptions" into qt-dev am: 2e761ef0 

am: b16525e7

Change-Id: If8a937f87aa602b96c933438eef79b925375e5e8
parents 446e9b4e b16525e7

core/proto/android/app/settings_enums.proto

+14 −5
Original line number Original line Diff line number Diff line
@@ -666,6 +666,11 @@ enum Action { 
    //ACTION: Log result for each card's eligibility check

    //ACTION: Log result for each card's eligibility check

    ACTION_CONTEXTUAL_CARD_ELIGIBILITY = 1686;

    ACTION_CONTEXTUAL_CARD_ELIGIBILITY = 1686;





    // ACTION: Display white balance setting enabled or disabled.

    // CATEGORY: SETTINGS

    // OS: Q

    ACTION_DISPLAY_WHITE_BALANCE_SETTING_CHANGED = 1703;



    // ACTION: Share a Wi-Fi network by generating a QR code

    // ACTION: Share a Wi-Fi network by generating a QR code

    ACTION_SETTINGS_SHARE_WIFI_QR_CODE = 1710;

    ACTION_SETTINGS_SHARE_WIFI_QR_CODE = 1710;
@@ -674,6 +679,15 @@ enum Action { 




    // ACTION: Share Wi-Fi hotspot by generating a QR code

    // ACTION: Share Wi-Fi hotspot by generating a QR code

    ACTION_SETTINGS_SHARE_WIFI_HOTSPOT_QR_CODE = 1712;

    ACTION_SETTINGS_SHARE_WIFI_HOTSPOT_QR_CODE = 1712;



    // ACTION: Settings > Initialize Search bar > Verify Slice > Invalid data

    ACTION_VERIFY_SLICE_ERROR_INVALID_DATA = 1725;



    // ACTION: Settings > Initialize Search bar > Verify Slice > Parsing error

    ACTION_VERIFY_SLICE_PARSING_ERROR = 1726;



    // ACTION: Settings > Initialize Search bar > Verify Slice > Other exception

    ACTION_VERIFY_SLICE_OTHER_EXCEPTION = 1727;

}

}





/**

/**
@@ -2341,11 +2355,6 @@ enum PageId { 
    // Open: Settings > app > bubble settings > confirmation dialog

    // Open: Settings > app > bubble settings > confirmation dialog

    DIALOG_APP_BUBBLE_SETTINGS = 1702;

    DIALOG_APP_BUBBLE_SETTINGS = 1702;





    // ACTION: Display white balance setting enabled or disabled.

    // CATEGORY: SETTINGS

    // OS: Q

    ACTION_DISPLAY_WHITE_BALANCE_SETTING_CHANGED = 1703;



    // OPEN: Settings > Pick SIM dialog

    // OPEN: Settings > Pick SIM dialog

    DIALOG_SIM_LIST = 1707;

    DIALOG_SIM_LIST = 1707;

proto/src/metrics_constants/metrics_constants.proto

+9 −0
Original line number Original line Diff line number Diff line
@@ -7284,6 +7284,15 @@ message MetricsEvent { 
    // type of response could not be determined

    // type of response could not be determined

    AUTOFILL_AUGMENTED_RESPONSE = 1724;

    AUTOFILL_AUGMENTED_RESPONSE = 1724;





    // ACTION: Settings > Initialize Search bar > Verify Slice > Invalid data

    ACTION_VERIFY_SLICE_ERROR_INVALID_DATA = 1725;



    // ACTION: Settings > Initialize Search bar > Verify Slice > Parsing error

    ACTION_VERIFY_SLICE_PARSING_ERROR = 1726;



    // ACTION: Settings > Initialize Search bar > Verify Slice > Other exception

    ACTION_VERIFY_SLICE_OTHER_EXCEPTION = 1727;



    // ---- Skipping ahead to avoid conflicts between master and release branches.

    // ---- Skipping ahead to avoid conflicts between master and release branches.





    // OPEN: Settings > System > Gestures > Global Actions Panel

    // OPEN: Settings > System > Gestures > Global Actions Panel