This change reflects the Dialer V10 RC00 branch.

RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843

following the instructions at go/dialer-aosp-release.

In this release:

* Removes final apache sources.
* Uses native lite compilation.

More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.

Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f

14 files changed, 609 insertions, 729 deletions

diff --git a/java/com/android/dialer/logging/LoggingBindings.java b/java/com/android/dialer/logging/LoggingBindings.java
index cf921c3fa..526cb2088 100644
--- a/java/com/android/dialer/logging/LoggingBindings.java
+++ b/java/com/android/dialer/logging/LoggingBindings.java
@@ -14,17 +14,25 @@
 
 package com.android.dialer.logging;
 
+
 import android.app.Activity;
 
 /** Allows the container application to gather analytics. */
 public interface LoggingBindings {
 
   /**
+   * Logs an DialerImpression event that's not associated with a specific call.
+   *
+   * @param dialerImpression an integer representing what event occurred.
+   */
+  void logImpression(DialerImpression.Type dialerImpression);
+
+  /**
    * Logs an impression for a general dialer event that's not associated with a specific call.
    *
    * @param dialerImpression an integer representing what event occurred.
-   * @see com.android.dialer.logging.nano.DialerImpression
    */
+  @Deprecated
   void logImpression(int dialerImpression);
 
   /**
@@ -33,26 +41,26 @@ public interface LoggingBindings {
    * @param dialerImpression an integer representing what event occurred.
    * @param callId unique ID of the call.
    * @param callStartTimeMillis the absolute time when the call started.
-   * @see com.android.dialer.logging.nano.DialerImpression
    */
-  void logCallImpression(int dialerImpression, String callId, long callStartTimeMillis);
+  void logCallImpression(
+      DialerImpression.Type dialerImpression, String callId, long callStartTimeMillis);
 
   /**
    * Logs an interaction that occurred.
    *
    * @param interaction an integer representing what interaction occurred.
-   * @see com.android.dialer.logging.nano.InteractionEvent
+   * @see com.android.dialer.logging.InteractionEvent
    */
-  void logInteraction(int interaction);
+  void logInteraction(InteractionEvent.Type interaction);
 
   /**
    * Logs an event indicating that a screen was displayed.
    *
    * @param screenEvent an integer representing the displayed screen.
    * @param activity Parent activity of the displayed screen.
-   * @see com.android.dialer.logging.nano.ScreenEvent
+   * @see com.android.dialer.logging.ScreenEvent
    */
-  void logScreenView(int screenEvent, Activity activity);
+  void logScreenView(com.android.dialer.logging.ScreenEvent.Type screenEvent, Activity activity);
 
   /** Logs a hit event to the analytics server. */
   void sendHitEventAnalytics(String category, String action, String label, long value);
diff --git a/java/com/android/dialer/logging/LoggingBindingsStub.java b/java/com/android/dialer/logging/LoggingBindingsStub.java
index 89c56eb91..f7ca6ecb0 100644
--- a/java/com/android/dialer/logging/LoggingBindingsStub.java
+++ b/java/com/android/dialer/logging/LoggingBindingsStub.java
@@ -20,16 +20,20 @@ import android.app.Activity;
 public class LoggingBindingsStub implements LoggingBindings {
 
   @Override
+  public void logImpression(DialerImpression.Type dialerImpression) {}
+
+  @Override
   public void logImpression(int dialerImpression) {}
 
   @Override
-  public void logCallImpression(int dialerImpression, String callId, long callStartTimeMillis) {}
+  public void logCallImpression(
+      DialerImpression.Type dialerImpression, String callId, long callStartTimeMillis) {}
 
   @Override
-  public void logInteraction(int interaction) {}
+  public void logInteraction(InteractionEvent.Type interaction) {}
 
   @Override
-  public void logScreenView(int screenEvent, Activity activity) {}
+  public void logScreenView(ScreenEvent.Type screenEvent, Activity activity) {}
 
   @Override
   public void sendHitEventAnalytics(String category, String action, String label, long value) {}
diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto
new file mode 100644
index 000000000..c9624aff1
--- /dev/null
+++ b/java/com/android/dialer/logging/contact_lookup_result.proto
@@ -0,0 +1,32 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message ContactLookupResult {
+  // The different results of a contact lookup done using a phone number.
+  enum Type {
+    UNKNOWN_LOOKUP_RESULT_TYPE = 0;
+
+    // Contact was not found in any of the sources.
+    NOT_FOUND = 1;
+
+    // Contact was found in the local database.
+    LOCAL_CONTACT = 2;
+
+    // Contact was found in Google Dialer's internal phone number cache
+    LOCAL_CACHE = 3;
+
+    // Contact was found via Google Caller ID
+    REMOTE = 4;
+
+    // Phone number was an emergency phone number
+    EMERGENCY = 5;
+
+    // Phone number was the SIM card's voicemail number
+    VOICEMAIL = 6;
+  }
+}
diff --git a/java/com/android/dialer/logging/contact_source.proto b/java/com/android/dialer/logging/contact_source.proto
new file mode 100644
index 000000000..ffd32de0e
--- /dev/null
+++ b/java/com/android/dialer/logging/contact_source.proto
@@ -0,0 +1,38 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message ContactSource {
+  // Applies only to reports made from call history. If we have contact
+  // information for the phone number, this field indicates its source.
+  // Note that it represents the contact's status on the user's device at the
+  // time they made the spam report, which could be different from the
+  // number's status at the time they made or received the call.
+  // Type definitions are from the CachedContactInfo interface in
+  // google3/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
+  enum Type {
+    UNKNOWN_SOURCE_TYPE = 0;
+
+    // Personal contact
+    SOURCE_TYPE_DIRECTORY = 1;
+
+    // Contact from a custom extended directory
+    SOURCE_TYPE_EXTENDED = 2;
+
+    // Business number found via the People API
+    SOURCE_TYPE_PLACES = 3;
+
+    // Non-business number found via the People API
+    SOURCE_TYPE_PROFILE = 4;
+
+    // Number has Caller Name Presentation (CNAP) information. Calls in this
+    // category would have had ContactLookupResultType NOT_FOUND originally.
+    SOURCE_TYPE_CNAP = 5;
+
+    SOURCE_TYPE_CEQUINT_CALLER_ID = 6;
+  }
+}
diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto
new file mode 100644
index 000000000..e3369d349
--- /dev/null
+++ b/java/com/android/dialer/logging/dialer_impression.proto
@@ -0,0 +1,384 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message DialerImpression {
+  // Event enums to be used for Impression Logging in Dialer.
+  // It's perfectly acceptable for this enum to be large
+  // Values should be from 1000 to 100000.
+  // Next Tag:1190
+  enum Type {
+
+    UNKNOWN_AOSP_EVENT_TYPE = 1000;
+
+    // User opened the app
+    APP_LAUNCHED = 1001;
+
+    // User pressed the speaker phone button
+    IN_CALL_SCREEN_TURN_ON_SPEAKERPHONE = 1002;
+
+    // User pressed the speaker phone button again
+    IN_CALL_SCREEN_TURN_ON_WIRED_OR_EARPIECE = 1003;
+
+    // Number not identified as spam and the user tapped the block/report spam button in the
+    // call log
+    CALL_LOG_BLOCK_REPORT_SPAM = 1004;
+
+    // Number identified as spam and the user tapped on the block number call log item
+    CALL_LOG_BLOCK_NUMBER = 1005;
+
+    // User tapped on the unblock number in the call log
+    // This does not deal with whether the user reported this spam or not while initially blocking
+    // For that refer to REPORT_AS_NOT_SPAM_VIA_UNBLOCK_NUMBER. If the user had not reported it as
+    // spam they then have the option of directly unblocking the number, a success of which is
+    // logged in USER_ACTION_UNBLOCKED_NUMBER
+    CALL_LOG_UNBLOCK_NUMBER = 1006;
+
+    // Number was identified as spam, and the user tapped that it was not spam
+    CALL_LOG_REPORT_AS_NOT_SPAM = 1007;
+
+    // Confirmation dialog in which the user confirmed that the number was not spam
+    DIALOG_ACTION_CONFIRM_NUMBER_NOT_SPAM = 1008;
+
+    // User unblocked a number and also acknowledged that the number is not spam
+    // This happens when the user had initially blocked a number and also claimed the number was
+    // spam and had now proceeded to undo that.
+    REPORT_AS_NOT_SPAM_VIA_UNBLOCK_NUMBER = 1009
+      ;
+
+    // A number that was identified as spam and the user proceeded to block it. However this
+    // impression was to make sure that while blocking the number the user also acknowledged that
+    // they were going to be reporting this as spam. There is no option for the user in this case
+    // to not report it as spam and block it only. The only flow is:
+    // system identified number as spam -> user wants to block it -> confirmation dialog shows up
+    // asking user to acknowledge they want to block and report as spam -> user acknowledges and
+    // this is when this impression is sent
+    DIALOG_ACTION_CONFIRM_NUMBER_SPAM_INDIRECTLY_VIA_BLOCK_NUMBER = 1010;
+
+    // User reported the number as spam by tick marking on report spam when blocking
+    // the number via call log. This is for case where the user wants to block a number and also
+    // report it as spam
+    REPORT_CALL_AS_SPAM_VIA_CALL_LOG_BLOCK_REPORT_SPAM_SENT_VIA_BLOCK_NUMBER_DIALOG = 1011
+      ;
+
+    // User made it to the last step and actually blocked the number
+    USER_ACTION_BLOCKED_NUMBER = 1012
+      ;
+
+    // User made it to the last step and actually unblocked the number
+    USER_ACTION_UNBLOCKED_NUMBER = 1013;
+
+    // User blocked a number, does not guarantee if the number was reported as spam or not
+    // To compute the number of blocked numbers that were reported as not spam and yet blocked
+    // Subtract this value from SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM. It would be
+    // interesting to see how this value compares with
+    // SPAM_AFTER_CALL_NOTIFICATION_REPORT_NUMBER_AS_NOT_SPAM
+    SPAM_AFTER_CALL_NOTIFICATION_BLOCK_NUMBER = 1014;
+
+    // Displays the dialog for first time spam calls with actions "Not spam", "Block", and
+    // "Dismiss".
+    SPAM_AFTER_CALL_NOTIFICATION_SHOW_SPAM_DIALOG = 1015;
+
+    // Displays the dialog for the first time unknown calls with actions "Add contact",
+    // "Block/report spam", and "Dismiss".
+    SPAM_AFTER_CALL_NOTIFICATION_SHOW_NON_SPAM_DIALOG = 1016;
+
+    // User added the number to contacts from the after call notification
+    SPAM_AFTER_CALL_NOTIFICATION_ADD_TO_CONTACTS = 1019
+      ;
+
+    // User marked the number as spam on the after call notification flow
+    SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM = 1020
+      ;
+
+    SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_NOT_SPAM_AND_BLOCKED = 1021;
+
+    // User reported the number as not spam
+    SPAM_AFTER_CALL_NOTIFICATION_REPORT_NUMBER_AS_NOT_SPAM = 1022
+      ;
+
+    // User dismissed the spam notification
+    SPAM_AFTER_CALL_NOTIFICATION_ON_DISMISS_SPAM_DIALOG = 1024;
+
+    // User dismissed the non spam notification
+    SPAM_AFTER_CALL_NOTIFICATION_ON_DISMISS_NON_SPAM_DIALOG = 1025;
+
+    // From the service instead of an activity logs the number of times the number was marked as
+    // Spam by the user (e.g from the feedback prompt)
+    SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_SPAM = 1026;
+
+    // From the service instead of an activity logs the number of times the number was marked as
+    // Not Spam by the user (e.g from the feedback prompt)
+    SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_NOT_SPAM = 1027;
+
+    // User is in a active call i.e either incoming or outgoing
+    // This is mainly so we can assign an impression event to a call event i.e so that we may be
+    // able to stitch different types of events if they make sense e.g user pressed a speaker button
+    // and we want to associate that to a call event
+    USER_PARTICIPATED_IN_A_CALL = 1028
+      ;
+
+    // Incoming call is a spam call
+    INCOMING_SPAM_CALL = 1029;
+
+    // Incoming call is a non spam call
+    INCOMING_NON_SPAM_CALL = 1030;
+
+    // Spam notifications shown despite throttling
+    SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1041;
+
+    // Spam notifications not shown due to throttling
+    SPAM_NOTIFICATION_NOT_SHOWN_AFTER_THROTTLE = 1042;
+
+    // Non spam notifications shown despite throttling
+    NON_SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1043;
+
+    // Non spam notifications not shown due to throttling
+    NON_SPAM_NOTIFICATION_NOT_SHOWN_AFTER_THROTTLE = 1044;
+
+    // Voicemail status has updated in the voicemail tab and the change PIN
+    // prompt is shown.
+    VOICEMAIL_ALERT_SET_PIN_SHOWN = 1045;
+
+    // User has clicked the change PIN action in the voicemail tab
+    VOICEMAIL_ALERT_SET_PIN_CLICKED = 1046;
+
+    // User was not able to or did not participate in the call e.g missed calls, rejected calls
+    USER_DID_NOT_PARTICIPATE_IN_CALL = 1047;
+
+    // User deleted a call log entry
+    USER_DELETED_CALL_LOG_ITEM = 1048
+      ;
+
+    // User tapped on "Send a message"
+    CALL_LOG_SEND_MESSAGE = 1049
+      ;
+
+    // User tapped on "Add to contact"
+    CALL_LOG_ADD_TO_CONTACT = 1050
+      ;
+
+    // User tapped on "Create new contact"
+    CALL_LOG_CREATE_NEW_CONTACT = 1051
+      ;
+
+    // User deleted an entry from the voicemail tab
+    VOICEMAIL_DELETE_ENTRY = 1052
+      ;
+
+    // Voicemail call log entry was expanded. Could be either if the user tapped the voicemail
+    // call log entry or pressed the play button when the voicemail call log entry was not expanded
+    VOICEMAIL_EXPAND_ENTRY = 1053
+      ;
+
+    // The play button for voicemail call log entry was tapped directly (i.e when the voicemail
+    // call log entry was not expanded and the playbutton was tapped)
+    VOICEMAIL_PLAY_AUDIO_DIRECTLY= 1054
+      ;
+
+    // The play button after expanding the voicemail call log entry was tapped
+    VOICEMAIL_PLAY_AUDIO_AFTER_EXPANDING_ENTRY= 1055
+      ;
+
+    // Incoming call was rejected from the notifications
+    REJECT_INCOMING_CALL_FROM_NOTIFICATION= 1056
+      ;
+
+    // Incoming call was rejected from the answer screen including rejecting via sms and talkback
+    REJECT_INCOMING_CALL_FROM_ANSWER_SCREEN= 1057
+      ;
+
+    // User tapped block and spam buttons in context menu, same as buttons in
+    // call log drop down
+    // menu (See 1004-1007).
+    CALL_LOG_CONTEXT_MENU_BLOCK_REPORT_SPAM = 1058;
+    CALL_LOG_CONTEXT_MENU_BLOCK_NUMBER = 1059;
+    CALL_LOG_CONTEXT_MENU_UNBLOCK_NUMBER = 1060;
+    CALL_LOG_CONTEXT_MENU_REPORT_AS_NOT_SPAM = 1061;
+
+    NEW_CONTACT_OVERFLOW = 1062;
+    NEW_CONTACT_FAB = 1063;
+
+    // The ToS is shown the user
+    VOICEMAIL_VVM3_TOS_SHOWN = 1064;
+
+    // The user has accepted the ToS
+    VOICEMAIL_VVM3_TOS_ACCEPTED = 1065;
+
+    // The user has went through the decline ToS dialog and VVM is disabled
+    VOICEMAIL_VVM3_TOS_DECLINED = 1066;
+
+    // The user has clicked the decline ToS button, and a conformation dialog
+    // was shown
+    VOICEMAIL_VVM3_TOS_DECLINE_CLICKED = 1067;
+
+    // The use has clicked the decline ToS button but the PIN has been
+    // randomized. A dialog to instruct the user to set the PIN has been shown
+    VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN = 1068;
+
+    // The user does not have a permission and are presented with a
+    // non-framework UI to request permission.
+    STORAGE_PERMISSION_DISPLAYED = 1069;
+    CAMERA_PERMISSION_DISPLAYED = 1074;
+
+    // The user is being shown the Android framework UI to request a permission.
+    STORAGE_PERMISSION_REQUESTED = 1070;
+    CAMERA_PERMISSION_REQUESTED = 1075;
+
+    // The user has permenantly denied a permission, so the user is being
+    // sent to dialer settings to grant permission.
+    STORAGE_PERMISSION_SETTINGS = 1071;
+    CAMERA_PERMISSION_SETTINGS = 1076;
+
+    // The user granted a permission.
+    STORAGE_PERMISSION_GRANTED = 1072;
+    CAMERA_PERMISSION_GRANTED = 1077;
+
+    // The user denied a permission.
+    STORAGE_PERMISSION_DENIED = 1073;
+    CAMERA_PERMISSION_DENIED = 1078;
+
+    // Voicemail config corruption is detected when in dialtacts activity.
+    VOICEMAIL_CONFIGURATION_STATE_CORRUPTION_DETECTED_FROM_ACTIVITY = 1079;
+    // Voicemail config corruption is detected when a new voicemail notification
+    // has arrived.
+    VOICEMAIL_CONFIGURATION_STATE_CORRUPTION_DETECTED_FROM_NOTIFICATION = 1080;
+
+    // Android Auto Backup and Restore (Dolly)
+    BACKUP_ON_BACKUP = 1081;
+    BACKUP_ON_FULL_BACKUP = 1082;
+    BACKUP_ON_BACKUP_DISABLED = 1083;
+    BACKUP_VOICEMAIL_BACKED_UP = 1084;
+    BACKUP_FULL_BACKED_UP = 1085;
+    BACKUP_ON_BACKUP_JSON_EXCEPTION = 1086;
+
+    BACKUP_ON_QUOTA_EXCEEDED = 1087;
+
+    BACKUP_ON_RESTORE = 1088;
+    BACKUP_RESTORED_FILE = 1089;
+    BACKUP_RESTORED_VOICEMAIL = 1090;
+    BACKUP_ON_RESTORE_FINISHED = 1091;
+    BACKUP_ON_RESTORE_DISABLED = 1092;
+    BACKUP_ON_RESTORE_JSON_EXCEPTION = 1093;
+    BACKUP_ON_RESTORE_IO_EXCEPTION = 1094;
+
+    BACKUP_MAX_VM_BACKUP_REACHED = 1095;
+
+    EVENT_ANSWER_HINT_ACTIVATED = 1096;
+    EVENT_ANSWER_HINT_DEACTIVATED = 1097;
+
+    VVM_TAB_VIEWED = 1098;
+
+    VVM_SHARE_VISIBLE = 1099;
+    VVM_SHARE_PRESSED = 1100;
+
+    OUTGOING_VIDEO_CALL = 1101;
+    INCOMING_VIDEO_CALL = 1102;
+    USER_PARTICIPATED_IN_A_VIDEO_CALL = 1103;
+
+    BACKUP_ON_RESTORE_VM_DUPLICATE_NOT_RESTORING = 1104;
+
+    // User tapped the 'Share and call' button to start the call composer
+    CALL_LOG_SHARE_AND_CALL = 1105;
+    CALL_COMPOSER_ACTIVITY_PLACE_RCS_CALL = 1106;
+    CALL_COMPOSER_ACTIVITY_SEND_AND_CALL_PRESSED_WHEN_SESSION_NOT_READY = 1107;
+
+    POST_CALL_PROMPT_USER_TO_SEND_MESSAGE_CLICKED = 1108;
+    POST_CALL_PROMPT_USER_TO_SEND_MESSAGE = 1109;
+    POST_CALL_PROMPT_USER_TO_VIEW_SENT_MESSAGE = 1110;
+    POST_CALL_PROMPT_USER_TO_VIEW_SENT_MESSAGE_CLICKED = 1111;
+
+    IN_CALL_SCREEN_TURN_ON_MUTE = 1112;
+    IN_CALL_SCREEN_TURN_OFF_MUTE = 1113;
+    IN_CALL_SCREEN_SWAP_CAMERA = 1114;
+    IN_CALL_SCREEN_TURN_ON_VIDEO = 1115;
+    IN_CALL_SCREEN_TURN_OFF_VIDEO = 1116;
+
+    VIDEO_CALL_WITH_INCOMING_VOICE_CALL = 1117;
+    VIDEO_CALL_WITH_INCOMING_VIDEO_CALL = 1118;
+    VOICE_CALL_WITH_INCOMING_VOICE_CALL = 1119;
+    VOICE_CALL_WITH_INCOMING_VIDEO_CALL = 1120;
+
+    CALL_DETAILS_COPY_NUMBER = 1121;
+    CALL_DETAILS_EDIT_BEFORE_CALL = 1122;
+    CALL_DETAILS_CALL_BACK = 1123;
+
+    VVM_USER_DISMISSED_VM_ALMOST_FULL_PROMO = 1124;
+    VVM_USER_DISMISSED_VM_FULL_PROMO = 1125;
+    VVM_USER_ENABLED_ARCHIVE_FROM_VM_ALMOST_FULL_PROMO = 1126;
+    VVM_USER_ENABLED_ARCHIVE_FROM_VM_FULL_PROMO = 1127;
+    VVM_USER_SHOWN_VM_ALMOST_FULL_PROMO = 1128;
+    VVM_USER_SHOWN_VM_FULL_PROMO = 1129;
+    VVM_USER_SHOWN_VM_ALMOST_FULL_ERROR_MESSAGE = 1130;
+    VVM_USER_SHOWN_VM_FULL_ERROR_MESSAGE = 1131;
+    VVM_USER_TURNED_ARCHIVE_ON_FROM_SETTINGS = 1132;
+    VVM_USER_TURNED_ARCHIVE_OFF_FROM_SETTINGS = 1133;
+    VVM_ARCHIVE_AUTO_DELETED_VM_FROM_SERVER = 1134;
+    VVM_ARCHIVE_AUTO_DELETE_TURNED_OFF = 1135;
+
+    VVM_TAB_VISIBLE = 1136;
+    VVM_UNBUNDLED_EVENT_RECEIVED = 1137;
+    VVM_ACTIVATION_STARTED = 1138;
+    VVM_ACTIVATION_COMPLETED = 1139;
+    VVM_AUTO_RETRY_ACTIVATION = 1140;
+    VVM_PROVISIONING_STARTED = 1141;
+    VVM_PROVISIONING_COMPLETED = 1142;
+    VVM_SYNC_STARTED = 1143;
+    VVM_SYNC_COMPLETED = 1144;
+    VVM_AUTO_RETRY_SYNC = 1145;
+    VVM_USER_RETRY = 1146;
+    VVM_USER_SYNC = 1147;
+    VVM_SETTINGS_VIEWED = 1148;
+    VVM_CHANGE_PIN_CLICKED = 1149;
+    VVM_CHANGE_PIN_COMPLETED = 1150;
+    VVM_CHANGE_RINGTONE_CLICKED = 1151;
+    VVM_CHANGE_VIBRATION_CLICKED = 1152;
+    VVM_USER_ENABLED_IN_SETTINGS = 1153;
+    VVM_USER_DISABLED_IN_SETTINGS = 1154;
+    VVM_ADVANCED_SETINGS_CLICKED = 1155;
+    VVM_NOTIFICATION_CLICKED = 1156;
+    VVM_NOTIFICATION_CREATED = 1157;
+    VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION = 1158;
+    VVM_TRANSCRIPTION_DOWNLOADED = 1159;
+    VVM_CHANGE_AIRPLANE_MODE_CLICKED = 1160;
+    VVM_CALL_VOICEMAIL_CLICKED = 1161;
+    VVM_QUOTA_CHECK_UNAVAILABLE = 1162;
+
+    // Emergency location impressions
+    EMERGENCY_NEW_EMERGENCY_CALL = 1163;
+    EMERGENCY_CALLBACK = 1164;
+    EMERGENCY_NO_LOCATION_PERMISSION = 1165;
+    EMERGENCY_BATTERY_TOO_LOW_TO_GET_LOCATION = 1166;
+    EMERGENCY_CANT_GET_LOCATION = 1167;
+    EMERGENCY_STALE_LOCATION = 1168;
+    EMERGENCY_INACCURATE_LOCATION = 1169;
+    EMERGENCY_GOT_LOCATION = 1170;
+    EMERGENCY_GOT_ADDRESS = 1171;
+    EMERGENCY_GOT_MAP = 1172;
+    EMERGENCY_LAUNCHED_MAP = 1173;
+
+    VIDEO_CALL_UPGRADE_REQUESTED = 1174;
+    VIDEO_CALL_REQUEST_ACCEPTED = 1175;
+    VIDEO_CALL_REQUEST_ACCEPTED_AS_AUDIO = 1176;
+    VIDEO_CALL_REQUEST_DECLINED = 1177;
+    VIDEO_CALL_REQUEST_RECEIVED = 1178;
+
+    RCS_VIDEO_SHARE_UPGRADE_REQUESTED = 1179;
+    RCS_VIDEO_SHARE_REQUEST_ACCEPTED = 1180;
+    RCS_VIDEO_SHARE_REQUEST_DECLINED = 1181;
+    RCS_VIDEO_SHARE_REQUEST_RECEIVED = 1182;
+
+    IMS_VIDEO_UPGRADE_REQUESTED = 1183;
+    IMS_VIDEO_REQUEST_ACCEPTED = 1184;
+    IMS_VIDEO_REQUEST_ACCEPTED_AS_AUDIO = 1185;
+    IMS_VIDEO_REQUEST_DECLINED = 1186;
+    IMS_VIDEO_REQUEST_RECEIVED = 1187;
+
+    VVM_STATUS_CHECK_READY = 1188;
+    VVM_STATUS_CHECK_REACTIVATION = 1189;
+  }
+}
diff --git a/java/com/android/dialer/logging/interaction_event.proto b/java/com/android/dialer/logging/interaction_event.proto
new file mode 100644
index 000000000..1075b1ff1
--- /dev/null
+++ b/java/com/android/dialer/logging/interaction_event.proto
@@ -0,0 +1,46 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message InteractionEvent {
+  enum Type {
+
+    UNKNOWN = 0;
+
+    // Leaving tags 1-14 for more frequent interactions, e.g. ANSWERED_CALL
+
+    // An incoming call was blocked
+    CALL_BLOCKED = 15;
+
+    // The user blocked a number from the Call Log screen
+    BLOCK_NUMBER_CALL_LOG = 16;
+
+    // The user blocked a number from the Call details screen
+    BLOCK_NUMBER_CALL_DETAIL = 17;
+
+    // The user blocked a number from the Management screen
+    BLOCK_NUMBER_MANAGEMENT_SCREEN = 18;
+
+    // The user unblocked a number from the Call Log screen
+    UNBLOCK_NUMBER_CALL_LOG = 19;
+
+    // The user unblocked a number from the Call details screen
+    UNBLOCK_NUMBER_CALL_DETAIL = 20;
+
+    // The user unblocked a number from the Management screen
+    UNBLOCK_NUMBER_MANAGEMENT_SCREEN = 21;
+
+    // The user blocked numbers from contacts marked as send to voicemail
+    IMPORT_SEND_TO_VOICEMAIL = 22;
+
+    // The user blocked a number then undid the block
+    UNDO_BLOCK_NUMBER = 23;
+
+    // The user unblocked a number then undid the unblock
+    UNDO_UNBLOCK_NUMBER = 24;
+  }
+}
diff --git a/java/com/android/dialer/logging/nano/ContactLookupResult.java b/java/com/android/dialer/logging/nano/ContactLookupResult.java
deleted file mode 100644
index 93f5f0135..000000000
--- a/java/com/android/dialer/logging/nano/ContactLookupResult.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package com.android.dialer.logging.nano;
-
-/** This file is autogenerated, but javadoc required. */
-@SuppressWarnings("hiding")
-public final class ContactLookupResult
-    extends com.google.protobuf.nano.ExtendableMessageNano<ContactLookupResult> {
-
-  /** This file is autogenerated, but javadoc required. */
-  // enum Type
-  public interface Type {
-    public static final int UNKNOWN_LOOKUP_RESULT_TYPE = 0;
-    public static final int NOT_FOUND = 1;
-    public static final int LOCAL_CONTACT = 2;
-    public static final int LOCAL_CACHE = 3;
-    public static final int REMOTE = 4;
-    public static final int EMERGENCY = 5;
-    public static final int VOICEMAIL = 6;
-  }
-
-  private static volatile ContactLookupResult[] _emptyArray;
-
-  public static ContactLookupResult[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ContactLookupResult[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // @@protoc_insertion_point(class_scope:com.android.dialer.logging.ContactLookupResult)
-
-  public ContactLookupResult() {
-    clear();
-  }
-
-  public ContactLookupResult clear() {
-    unknownFieldData = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public ContactLookupResult mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default:
-          {
-            if (!super.storeUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-      }
-    }
-  }
-
-  public static ContactLookupResult parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ContactLookupResult(), data);
-  }
-
-  public static ContactLookupResult parseFrom(
-      com.google.protobuf.nano.CodedInputByteBufferNano input) throws java.io.IOException {
-    return new ContactLookupResult().mergeFrom(input);
-  }
-}
diff --git a/java/com/android/dialer/logging/nano/ContactSource.java b/java/com/android/dialer/logging/nano/ContactSource.java
deleted file mode 100644
index dbe40cd53..000000000
--- a/java/com/android/dialer/logging/nano/ContactSource.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package com.android.dialer.logging.nano;
-
-/** This file is autogenerated, but javadoc required. */
-@SuppressWarnings("hiding")
-public final class ContactSource
-    extends com.google.protobuf.nano.ExtendableMessageNano<ContactSource> {
-
-  /** This file is autogenerated, but javadoc required. */
-  // enum Type
-  public interface Type {
-    public static final int UNKNOWN_SOURCE_TYPE = 0;
-    public static final int SOURCE_TYPE_DIRECTORY = 1;
-    public static final int SOURCE_TYPE_EXTENDED = 2;
-    public static final int SOURCE_TYPE_PLACES = 3;
-    public static final int SOURCE_TYPE_PROFILE = 4;
-    public static final int SOURCE_TYPE_CNAP = 5;
-  }
-
-  private static volatile ContactSource[] _emptyArray;
-
-  public static ContactSource[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ContactSource[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // @@protoc_insertion_point(class_scope:com.android.dialer.logging.ContactSource)
-
-  public ContactSource() {
-    clear();
-  }
-
-  public ContactSource clear() {
-    unknownFieldData = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public ContactSource mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default:
-          {
-            if (!super.storeUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-      }
-    }
-  }
-
-  public static ContactSource parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ContactSource(), data);
-  }
-
-  public static ContactSource parseFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ContactSource().mergeFrom(input);
-  }
-}
diff --git a/java/com/android/dialer/logging/nano/DialerImpression.java b/java/com/android/dialer/logging/nano/DialerImpression.java
deleted file mode 100644
index 9f3f96116..000000000
--- a/java/com/android/dialer/logging/nano/DialerImpression.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package com.android.dialer.logging.nano;
-
-/** This file is autogenerated, but javadoc required. */
-@SuppressWarnings("hiding")
-public final class DialerImpression
-    extends com.google.protobuf.nano.ExtendableMessageNano<DialerImpression> {
-
-  /** This file is autogenerated, but javadoc required. */
-  // enum Type
-  public interface Type {
-    public static final int UNKNOWN_AOSP_EVENT_TYPE = 1000;
-    public static final int APP_LAUNCHED = 1001;
-    public static final int IN_CALL_SCREEN_TURN_ON_SPEAKERPHONE = 1002;
-    public static final int IN_CALL_SCREEN_TURN_ON_WIRED_OR_EARPIECE = 1003;
-    public static final int CALL_LOG_BLOCK_REPORT_SPAM = 1004;
-    public static final int CALL_LOG_BLOCK_NUMBER = 1005;
-    public static final int CALL_LOG_UNBLOCK_NUMBER = 1006;
-    public static final int CALL_LOG_REPORT_AS_NOT_SPAM = 1007;
-    public static final int DIALOG_ACTION_CONFIRM_NUMBER_NOT_SPAM = 1008;
-    public static final int REPORT_AS_NOT_SPAM_VIA_UNBLOCK_NUMBER = 1009;
-    public static final int DIALOG_ACTION_CONFIRM_NUMBER_SPAM_INDIRECTLY_VIA_BLOCK_NUMBER = 1010;
-    public static final int
-        REPORT_CALL_AS_SPAM_VIA_CALL_LOG_BLOCK_REPORT_SPAM_SENT_VIA_BLOCK_NUMBER_DIALOG = 1011;
-    public static final int USER_ACTION_BLOCKED_NUMBER = 1012;
-    public static final int USER_ACTION_UNBLOCKED_NUMBER = 1013;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_BLOCK_NUMBER = 1014;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_SHOW_SPAM_DIALOG = 1015;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_SHOW_NON_SPAM_DIALOG = 1016;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_ADD_TO_CONTACTS = 1019;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM = 1020;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_NOT_SPAM_AND_BLOCKED =
-        1021;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_REPORT_NUMBER_AS_NOT_SPAM = 1022;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_ON_DISMISS_SPAM_DIALOG = 1024;
-    public static final int SPAM_AFTER_CALL_NOTIFICATION_ON_DISMISS_NON_SPAM_DIALOG = 1025;
-    public static final int SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_SPAM = 1026;
-    public static final int SPAM_NOTIFICATION_SERVICE_ACTION_MARK_NUMBER_AS_NOT_SPAM = 1027;
-    public static final int USER_PARTICIPATED_IN_A_CALL = 1028;
-    public static final int INCOMING_SPAM_CALL = 1029;
-    public static final int INCOMING_NON_SPAM_CALL = 1030;
-    public static final int SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1041;
-    public static final int SPAM_NOTIFICATION_NOT_SHOWN_AFTER_THROTTLE = 1042;
-    public static final int NON_SPAM_NOTIFICATION_SHOWN_AFTER_THROTTLE = 1043;
-    public static final int NON_SPAM_NOTIFICATION_NOT_SHOWN_AFTER_THROTTLE = 1044;
-    public static final int VOICEMAIL_ALERT_SET_PIN_SHOWN = 1045;
-    public static final int VOICEMAIL_ALERT_SET_PIN_CLICKED = 1046;
-    public static final int USER_DID_NOT_PARTICIPATE_IN_CALL = 1047;
-    public static final int USER_DELETED_CALL_LOG_ITEM = 1048;
-    public static final int CALL_LOG_SEND_MESSAGE = 1049;
-    public static final int CALL_LOG_ADD_TO_CONTACT = 1050;
-    public static final int CALL_LOG_CREATE_NEW_CONTACT = 1051;
-    public static final int VOICEMAIL_DELETE_ENTRY = 1052;
-    public static final int VOICEMAIL_EXPAND_ENTRY = 1053;
-    public static final int VOICEMAIL_PLAY_AUDIO_DIRECTLY = 1054;
-    public static final int VOICEMAIL_PLAY_AUDIO_AFTER_EXPANDING_ENTRY = 1055;
-    public static final int REJECT_INCOMING_CALL_FROM_NOTIFICATION = 1056;
-    public static final int REJECT_INCOMING_CALL_FROM_ANSWER_SCREEN = 1057;
-    public static final int CALL_LOG_CONTEXT_MENU_BLOCK_REPORT_SPAM = 1058;
-    public static final int CALL_LOG_CONTEXT_MENU_BLOCK_NUMBER = 1059;
-    public static final int CALL_LOG_CONTEXT_MENU_UNBLOCK_NUMBER = 1060;
-    public static final int CALL_LOG_CONTEXT_MENU_REPORT_AS_NOT_SPAM = 1061;
-    public static final int NEW_CONTACT_OVERFLOW = 1062;
-    public static final int NEW_CONTACT_FAB = 1063;
-    public static final int VOICEMAIL_VVM3_TOS_SHOWN = 1064;
-    public static final int VOICEMAIL_VVM3_TOS_ACCEPTED = 1065;
-    public static final int VOICEMAIL_VVM3_TOS_DECLINED = 1066;
-    public static final int VOICEMAIL_VVM3_TOS_DECLINE_CLICKED = 1067;
-    public static final int VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN = 1068;
-    public static final int STORAGE_PERMISSION_DISPLAYED = 1069;
-    public static final int CAMERA_PERMISSION_DISPLAYED = 1074;
-    public static final int STORAGE_PERMISSION_REQUESTED = 1070;
-    public static final int CAMERA_PERMISSION_REQUESTED = 1075;
-    public static final int STORAGE_PERMISSION_SETTINGS = 1071;
-    public static final int CAMERA_PERMISSION_SETTINGS = 1076;
-    public static final int STORAGE_PERMISSION_GRANTED = 1072;
-    public static final int CAMERA_PERMISSION_GRANTED = 1077;
-    public static final int STORAGE_PERMISSION_DENIED = 1073;
-    public static final int CAMERA_PERMISSION_DENIED = 1078;
-    public static final int VOICEMAIL_CONFIGURATION_STATE_CORRUPTION_DETECTED_FROM_ACTIVITY = 1079;
-    public static final int VOICEMAIL_CONFIGURATION_STATE_CORRUPTION_DETECTED_FROM_NOTIFICATION =
-        1080;
-    public static final int BACKUP_ON_BACKUP = 1081;
-    public static final int BACKUP_ON_FULL_BACKUP = 1082;
-    public static final int BACKUP_ON_BACKUP_DISABLED = 1083;
-    public static final int BACKUP_VOICEMAIL_BACKED_UP = 1084;
-    public static final int BACKUP_FULL_BACKED_UP = 1085;
-    public static final int BACKUP_ON_BACKUP_JSON_EXCEPTION = 1086;
-    public static final int BACKUP_ON_QUOTA_EXCEEDED = 1087;
-    public static final int BACKUP_ON_RESTORE = 1088;
-    public static final int BACKUP_RESTORED_FILE = 1089;
-    public static final int BACKUP_RESTORED_VOICEMAIL = 1090;
-    public static final int BACKUP_ON_RESTORE_FINISHED = 1091;
-    public static final int BACKUP_ON_RESTORE_DISABLED = 1092;
-    public static final int BACKUP_ON_RESTORE_JSON_EXCEPTION = 1093;
-    public static final int BACKUP_ON_RESTORE_IO_EXCEPTION = 1094;
-    public static final int BACKUP_MAX_VM_BACKUP_REACHED = 1095;
-    public static final int EVENT_ANSWER_HINT_ACTIVATED = 1096;
-    public static final int EVENT_ANSWER_HINT_DEACTIVATED = 1097;
-    public static final int VVM_TAB_VIEWED = 1098;
-    public static final int VVM_SHARE_VISIBLE = 1099;
-    public static final int VVM_SHARE_PRESSED = 1100;
-    public static final int OUTGOING_VIDEO_CALL = 1101;
-    public static final int INCOMING_VIDEO_CALL = 1102;
-    public static final int USER_PARTICIPATED_IN_A_VIDEO_CALL = 1103;
-    public static final int BACKUP_ON_RESTORE_VM_DUPLICATE_NOT_RESTORING = 1104;
-    public static final int CALL_LOG_SHARE_AND_CALL = 1105;
-    public static final int CALL_COMPOSER_ACTIVITY_PLACE_RCS_CALL = 1106;
-    public static final int CALL_COMPOSER_ACTIVITY_SEND_AND_CALL_PRESSED_WHEN_SESSION_NOT_READY =
-        1107;
-    public static final int POST_CALL_PROMPT_USER_TO_SEND_MESSAGE_CLICKED = 1108;
-    public static final int POST_CALL_PROMPT_USER_TO_SEND_MESSAGE = 1109;
-    public static final int POST_CALL_PROMPT_USER_TO_VIEW_SENT_MESSAGE = 1110;
-    public static final int POST_CALL_PROMPT_USER_TO_VIEW_SENT_MESSAGE_CLICKED = 1111;
-    public static final int IN_CALL_SCREEN_TURN_ON_MUTE = 1112;
-    public static final int IN_CALL_SCREEN_TURN_OFF_MUTE = 1113;
-    public static final int IN_CALL_SCREEN_SWAP_CAMERA = 1114;
-    public static final int IN_CALL_SCREEN_TURN_ON_VIDEO = 1115;
-    public static final int IN_CALL_SCREEN_TURN_OFF_VIDEO = 1116;
-    public static final int VIDEO_CALL_WITH_INCOMING_VOICE_CALL = 1117;
-    public static final int VIDEO_CALL_WITH_INCOMING_VIDEO_CALL = 1118;
-    public static final int VOICE_CALL_WITH_INCOMING_VOICE_CALL = 1119;
-    public static final int VOICE_CALL_WITH_INCOMING_VIDEO_CALL = 1120;
-    public static final int CALL_DETAILS_COPY_NUMBER = 1121;
-    public static final int CALL_DETAILS_EDIT_BEFORE_CALL = 1122;
-    public static final int CALL_DETAILS_CALL_BACK = 1123;
-    public static final int VVM_USER_DISMISSED_VM_ALMOST_FULL_PROMO = 1124;
-    public static final int VVM_USER_DISMISSED_VM_FULL_PROMO = 1125;
-    public static final int VVM_USER_ENABLED_ARCHIVE_FROM_VM_ALMOST_FULL_PROMO = 1126;
-    public static final int VVM_USER_ENABLED_ARCHIVE_FROM_VM_FULL_PROMO = 1127;
-    public static final int VVM_USER_SHOWN_VM_ALMOST_FULL_PROMO = 1128;
-    public static final int VVM_USER_SHOWN_VM_FULL_PROMO = 1129;
-    public static final int VVM_USER_SHOWN_VM_ALMOST_FULL_ERROR_MESSAGE = 1130;
-    public static final int VVM_USER_SHOWN_VM_FULL_ERROR_MESSAGE = 1131;
-    public static final int VVM_USER_TURNED_ARCHIVE_ON_FROM_SETTINGS = 1132;
-    public static final int VVM_USER_TURNED_ARCHIVE_OFF_FROM_SETTINGS = 1133;
-    public static final int VVM_ARCHIVE_AUTO_DELETED_VM_FROM_SERVER = 1134;
-    public static final int VVM_ARCHIVE_AUTO_DELETE_TURNED_OFF = 1135;
-    public static final int VVM_TAB_VISIBLE = 1136;
-    public static final int VVM_UNBUNDLED_EVENT_RECEIVED = 1137;
-    public static final int VVM_ACTIVATION_STARTED = 1138;
-    public static final int VVM_ACTIVATION_COMPLETED = 1139;
-    public static final int VVM_AUTO_RETRY_ACTIVATION = 1140;
-    public static final int VVM_PROVISIONING_STARTED = 1141;
-    public static final int VVM_PROVISIONING_COMPLETED = 1142;
-    public static final int VVM_SYNC_STARTED = 1143;
-    public static final int VVM_SYNC_COMPLETED = 1144;
-    public static final int VVM_AUTO_RETRY_SYNC = 1145;
-    public static final int VVM_USER_RETRY = 1146;
-    public static final int VVM_USER_SYNC = 1147;
-    public static final int VVM_SETTINGS_VIEWED = 1148;
-    public static final int VVM_CHANGE_PIN_CLICKED = 1149;
-    public static final int VVM_CHANGE_PIN_COMPLETED = 1150;
-    public static final int VVM_CHANGE_RINGTONE_CLICKED = 1151;
-    public static final int VVM_CHANGE_VIBRATION_CLICKED = 1152;
-    public static final int VVM_USER_ENABLED_IN_SETTINGS = 1153;
-    public static final int VVM_USER_DISABLED_IN_SETTINGS = 1154;
-    public static final int VVM_ADVANCED_SETINGS_CLICKED = 1155;
-    public static final int VVM_NOTIFICATION_CLICKED = 1156;
-    public static final int VVM_NOTIFICATION_CREATED = 1157;
-    public static final int VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION = 1158;
-    public static final int VVM_TRANSCRIPTION_DOWNLOADED = 1159;
-    public static final int VVM_CHANGE_AIRPLANE_MODE_CLICKED = 1160;
-    public static final int VVM_CALL_VOICEMAIL_CLICKED = 1161;
-    public static final int VVM_QUOTA_CHECK_UNAVAILABLE = 1162;
-    public static final int EMERGENCY_NEW_EMERGENCY_CALL = 1163;
-    public static final int EMERGENCY_CALLBACK = 1164;
-    public static final int EMERGENCY_NO_LOCATION_PERMISSION = 1165;
-    public static final int EMERGENCY_BATTERY_TOO_LOW_TO_GET_LOCATION = 1166;
-    public static final int EMERGENCY_CANT_GET_LOCATION = 1167;
-    public static final int EMERGENCY_STALE_LOCATION = 1168;
-    public static final int EMERGENCY_INACCURATE_LOCATION = 1169;
-    public static final int EMERGENCY_GOT_LOCATION = 1170;
-    public static final int EMERGENCY_GOT_ADDRESS = 1171;
-    public static final int EMERGENCY_GOT_MAP = 1172;
-    public static final int EMERGENCY_LAUNCHED_MAP = 1173;
-  }
-
-  private static volatile DialerImpression[] _emptyArray;
-  public static DialerImpression[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new DialerImpression[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // @@protoc_insertion_point(class_scope:com.android.dialer.logging.DialerImpression)
-
-  public DialerImpression() {
-    clear();
-  }
-
-  public DialerImpression clear() {
-    unknownFieldData = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public DialerImpression mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default:
-          {
-            if (!super.storeUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-      }
-    }
-  }
-
-  public static DialerImpression parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new DialerImpression(), data);
-  }
-
-  public static DialerImpression parseFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new DialerImpression().mergeFrom(input);
-  }
-}
diff --git a/java/com/android/dialer/logging/nano/InteractionEvent.java b/java/com/android/dialer/logging/nano/InteractionEvent.java
deleted file mode 100644
index 7ca95fa45..000000000
--- a/java/com/android/dialer/logging/nano/InteractionEvent.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package com.android.dialer.logging.nano;
-
-/** This file is autogenerated, but javadoc required. */
-@SuppressWarnings("hiding")
-public final class InteractionEvent
-    extends com.google.protobuf.nano.ExtendableMessageNano<InteractionEvent> {
-
-  /** This file is autogenerated, but javadoc required. */
-  // enum Type
-  public interface Type {
-    public static final int UNKNOWN = 0;
-    public static final int CALL_BLOCKED = 15;
-    public static final int BLOCK_NUMBER_CALL_LOG = 16;
-    public static final int BLOCK_NUMBER_CALL_DETAIL = 17;
-    public static final int BLOCK_NUMBER_MANAGEMENT_SCREEN = 18;
-    public static final int UNBLOCK_NUMBER_CALL_LOG = 19;
-    public static final int UNBLOCK_NUMBER_CALL_DETAIL = 20;
-    public static final int UNBLOCK_NUMBER_MANAGEMENT_SCREEN = 21;
-    public static final int IMPORT_SEND_TO_VOICEMAIL = 22;
-    public static final int UNDO_BLOCK_NUMBER = 23;
-    public static final int UNDO_UNBLOCK_NUMBER = 24;
-  }
-
-  private static volatile InteractionEvent[] _emptyArray;
-  public static InteractionEvent[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new InteractionEvent[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // @@protoc_insertion_point(class_scope:com.android.dialer.logging.InteractionEvent)
-
-  public InteractionEvent() {
-    clear();
-  }
-
-  public InteractionEvent clear() {
-    unknownFieldData = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public InteractionEvent mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default:
-          {
-            if (!super.storeUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-      }
-    }
-  }
-
-  public static InteractionEvent parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new InteractionEvent(), data);
-  }
-
-  public static InteractionEvent parseFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new InteractionEvent().mergeFrom(input);
-  }
-}
diff --git a/java/com/android/dialer/logging/nano/ReportingLocation.java b/java/com/android/dialer/logging/nano/ReportingLocation.java
deleted file mode 100644
index 08ee04e7e..000000000
--- a/java/com/android/dialer/logging/nano/ReportingLocation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package com.android.dialer.logging.nano;
-
-/** This file is autogenerated, but javadoc required. */
-@SuppressWarnings("hiding")
-public final class ReportingLocation
-    extends com.google.protobuf.nano.ExtendableMessageNano<ReportingLocation> {
-
-  /** This file is autogenerated, but javadoc required. */
-  // enum Type
-  public interface Type {
-    public static final int UNKNOWN_REPORTING_LOCATION = 0;
-    public static final int CALL_LOG_HISTORY = 1;
-    public static final int FEEDBACK_PROMPT = 2;
-  }
-
-  private static volatile ReportingLocation[] _emptyArray;
-
-  public static ReportingLocation[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ReportingLocation[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // @@protoc_insertion_point(class_scope:com.android.dialer.logging.ReportingLocation)
-
-  public ReportingLocation() {
-    clear();
-  }
-
-  public ReportingLocation clear() {
-    unknownFieldData = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public ReportingLocation mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default:
-          {
-            if (!super.storeUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-      }
-    }
-  }
-
-  public static ReportingLocation parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ReportingLocation(), data);
-  }
-
-  public static ReportingLocation parseFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ReportingLocation().mergeFrom(input);
-  }
-}
diff --git a/java/com/android/dialer/logging/nano/ScreenEvent.java b/java/com/android/dialer/logging/nano/ScreenEvent.java
deleted file mode 100644
index bd5b817e1..000000000
--- a/java/com/android/dialer/logging/nano/ScreenEvent.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package com.android.dialer.logging.nano;
-
-/** This file is autogenerated, but javadoc required. */
-@SuppressWarnings("hiding")
-public final class ScreenEvent extends com.google.protobuf.nano.ExtendableMessageNano<ScreenEvent> {
-
-  /** This file is autogenerated, but javadoc required. */
-  // enum Type
-  public interface Type {
-    public static final int UNKNOWN = 0;
-    public static final int DIALPAD = 1;
-    public static final int SPEED_DIAL = 2;
-    public static final int CALL_LOG = 3;
-    public static final int VOICEMAIL_LOG = 4;
-    public static final int ALL_CONTACTS = 5;
-    public static final int REGULAR_SEARCH = 6;
-    public static final int SMART_DIAL_SEARCH = 7;
-    public static final int CALL_LOG_FILTER = 8;
-    public static final int SETTINGS = 9;
-    public static final int IMPORT_EXPORT_CONTACTS = 10;
-    public static final int CLEAR_FREQUENTS = 11;
-    public static final int SEND_FEEDBACK = 12;
-    public static final int INCALL = 13;
-    public static final int INCOMING_CALL = 14;
-    public static final int CONFERENCE_MANAGEMENT = 15;
-    public static final int INCALL_DIALPAD = 16;
-    public static final int CALL_LOG_CONTEXT_MENU = 17;
-    public static final int BLOCKED_NUMBER_MANAGEMENT = 18;
-    public static final int BLOCKED_NUMBER_ADD_NUMBER = 19;
-    public static final int CALL_DETAILS = 20;
-  }
-
-  private static volatile ScreenEvent[] _emptyArray;
-  public static ScreenEvent[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ScreenEvent[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // @@protoc_insertion_point(class_scope:com.android.dialer.logging.ScreenEvent)
-
-  public ScreenEvent() {
-    clear();
-  }
-
-  public ScreenEvent clear() {
-    unknownFieldData = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public ScreenEvent mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default:
-          {
-            if (!super.storeUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-      }
-    }
-  }
-
-  public static ScreenEvent parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ScreenEvent(), data);
-  }
-
-  public static ScreenEvent parseFrom(com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ScreenEvent().mergeFrom(input);
-  }
-}
diff --git a/java/com/android/dialer/logging/reporting_location.proto b/java/com/android/dialer/logging/reporting_location.proto
new file mode 100644
index 000000000..d436564df
--- /dev/null
+++ b/java/com/android/dialer/logging/reporting_location.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message ReportingLocation {
+  // Spam reporting location
+  enum Type {
+    UNKNOWN_REPORTING_LOCATION = 0;
+    CALL_LOG_HISTORY = 1;
+    FEEDBACK_PROMPT = 2;
+  }
+}
diff --git a/java/com/android/dialer/logging/screen_event.proto b/java/com/android/dialer/logging/screen_event.proto
new file mode 100644
index 000000000..ca624774d
--- /dev/null
+++ b/java/com/android/dialer/logging/screen_event.proto
@@ -0,0 +1,71 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message ScreenEvent {
+  enum Type {
+
+    UNKNOWN = 0;
+
+    DIALPAD = 1;
+
+    SPEED_DIAL = 2;
+
+    CALL_LOG = 3;
+
+    // The tab containing the list of voicemails only.
+    VOICEMAIL_LOG = 4;
+
+    // The tab containing the list of all contacts.
+    ALL_CONTACTS = 5;
+
+    // List of search results returned by typing into the search box.
+    REGULAR_SEARCH = 6;
+
+    // List of search results returned by typing into the dialpad.
+    SMART_DIAL_SEARCH = 7;
+
+    CALL_LOG_FILTER = 8;
+
+    SETTINGS = 9;
+
+    // The "Import/export contacts" dialog launched via the overflow menu.
+    IMPORT_EXPORT_CONTACTS = 10;
+
+    // The "Clear frequents" dialog launched via the overflow menu.
+    CLEAR_FREQUENTS = 11;
+
+    // The "Send feedback" dialog launched via the overflow menu.
+    SEND_FEEDBACK = 12;
+
+    // The main in call screen that displays caller details and contact photos
+    INCALL = 13;
+
+    // The screen that displays the glowpad widget (slide right to answer,
+    // slide left to dismiss).
+    INCOMING_CALL = 14;
+
+    // Conference management fragment displayed for conferences that support
+    // management of individual calls within the conference.
+    CONFERENCE_MANAGEMENT = 15;
+
+    // The dialpad displayed in-call that is used to send dtmf tones.
+    INCALL_DIALPAD = 16;
+
+    // Menu options displayed when long pressing on a call log entry
+    CALL_LOG_CONTEXT_MENU = 17;
+
+    // Screen displayed to allow the user to see an overview of all blocked
+    // numbers
+    BLOCKED_NUMBER_MANAGEMENT = 18;
+
+    // Screen displayed to allow the user to add a new blocked number
+    BLOCKED_NUMBER_ADD_NUMBER = 19;
+
+    CALL_DETAILS = 20;
+  }
+}