Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add logging enums for slice converter exceptions" into qt-dev

Browse Source 
am: 2e761ef06c

Change-Id: I0bf0c50c15e8e08a57a75387135b56d39deb6381
This commit is contained in:
tmfang
2019-05-09 11:04:38 -07:00
committed by android-build-merger
parent fcc7e14d24 2e761ef06c
commit b16525e73c
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/proto/android/app/settings_enums.proto
View File

@@ -666,6 +666,11 @@ enum Action {
//ACTION: Log result for each card's eligibility check
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_SETTINGS_SHARE_WIFI_QR_CODE = 1710;
@@ -674,6 +679,15 @@ enum Action {
// ACTION: Share Wi-Fi hotspot by generating a QR code
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
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
DIALOG_SIM_LIST = 1707;

9
proto/src/metrics_constants/metrics_constants.proto
View File

@@ -7284,6 +7284,15 @@ message MetricsEvent {
// type of response could not be determined
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.
// OPEN: Settings > System > Gestures > Global Actions Panel
// CATEGORY: SETTINGS