Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev

am: 5e687224bd

Change-Id: I23817abcefde8700c101b756ee6a39d153ea7af5

diff --cc proto/src/metrics_constants.proto
index 3d3dc33,3cadff2..d0358b6
--- 1/proto/src/metrics_constants.proto
--- 2/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@@ -4584,74 -4585,35 +4585,77 @@@ message MetricsEvent 
      // logged when we cancel an app transition.
      APP_TRANSITION_CANCELLED = 1144;
  
+     // Tag of a field representing a duration on autofill-related metrics.
+     FIELD_AUTOFILL_DURATION = 1145;
+ 
      // ---- End O-MR1 Constants, all O-MR1 constants go above this line ----
  
 -    // ACTION: Stop an app and turn on background check
 +    // OPEN: Settings > Network & Internet > Mobile network
      // CATEGORY: SETTINGS
 -    // OS: P
 -    ACTION_APP_STOP_AND_BACKGROUND_CHECK = 1233;
 +    SETTINGS_MOBILE_NETWORK_CATEGORY = 1200;
  
 -    // FIELD: The action type for each anomaly
 +    // ACTION: Settings > Network & Internet > Mobile network > Roaming
      // CATEGORY: SETTINGS
 -    // OS: P
 -    FIELD_ANOMALY_ACTION_TYPE = 1234;
 +    ACTION_MOBILE_NETWORK_DATA_ROAMING_TOGGLE = 1201;
  
 -    // OPEN: Settings -> Battery -> Wakelock anomaly
 +    // ACTION: Settings > Network & Internet > Mobile network > Advanced
      // CATEGORY: SETTINGS
 -    // OS: P
 -    ANOMALY_TYPE_WAKELOCK = 1235;
 +    ACTION_MOBILE_NETWORK_EXPAND_ADVANCED_FIELDS = 1202;
  
 -    // OPEN: Settings -> Battery -> Wakeup alarm anomaly
 +    // ACTION: Settings > Network & Internet > Mobile network > Enhanced 4G LTE Mode
      // CATEGORY: SETTINGS
 -    // OS: P
 -    ANOMALY_TYPE_WAKEUP_ALARM = 1236;
 +    ACTION_MOBILE_ENHANCED_4G_LTE_MODE_TOGGLE = 1203;
  
 -    // OPEN: Settings -> Battery -> Unoptimized bt anomaly
 +    // ACTION: Settings > Network & Internet > Mobile network > Preferred network type
      // CATEGORY: SETTINGS
 -    // OS: P
 -    ANOMALY_TYPE_UNOPTIMIZED_BT = 1237;
 +    ACTION_MOBILE_NETWORK_SELECT_PREFERRED_NETWORK = 1204;
 +
 +    // ACTION: Settings > Network & Internet > Mobile network > Preferred network type (enabled networks)
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_SELECT_ENABLED_NETWORK = 1205;
 +
 +    // OPEN: Settings > Network & Internet > Mobile network > Carrier
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_EUICC_SETTING = 1206;
 +
 +    // OPEN: Settings > Network & Internet > Mobile network > Wi-Fi calling
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_WIFI_CALLING = 1207;
 +
 +    // ACTION: Settings > Network & Internet > Mobile network > Carrier video calling
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_VIDEO_CALLING_TOGGLE = 1208;
 +
 +    // ACTION: Settings > Network & Internet > Mobile network > Automatically select network
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_AUTO_SELECT_NETWORK_TOGGLE = 1209;
 +
 +    // ACTION: Settings > Network & Internet > Mobile network > Network
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK = 1210;
 +
 +    // FIELD - Manually selected mobile network
 +    FIELD_MOBILE_NETWORK = 1211;
 +
 +    // OPEN: Settings > Network & Internet > Mobile network > Access Point Names
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_APN_SETTINGS = 1212;
 +
 +    // OPEN: Settings > Network & Internet > Mobile network > Carrier settings
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_CARRIER_SETTINGS = 1213;
 +
 +    // OPEN: Settings > Network & Internet > Mobile network > System select
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_CDMA_SYSTEM_SELECT = 1214;
 +
 +    // OPEN: Settings > Network & Internet > Mobile network > CDMA subscription
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_CDMA_SUBSCRIPTION_SELECT = 1215;
 +
 +    // ACTION: Settings > Network & Internet > Mobile network > Set up data service
 +    // CATEGORY: SETTINGS
 +    ACTION_MOBILE_NETWORK_SET_UP_DATA_SERVICE = 1216;
  
      // Add new aosp constants above this line.
      // END OF AOSP CONSTANTS