Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

6 files changed, 98 insertions, 62 deletions

diff --git a/java/com/android/dialer/logging/nano/ContactLookupResult.java b/java/com/android/dialer/logging/nano/ContactLookupResult.java
index 8960560fb..93f5f0135 100644
--- a/java/com/android/dialer/logging/nano/ContactLookupResult.java
+++ b/java/com/android/dialer/logging/nano/ContactLookupResult.java
@@ -11,17 +11,19 @@
  * 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
+ * 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> {
+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;
@@ -34,11 +36,11 @@ public final class ContactLookupResult extends
   }
 
   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) {
+      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
         if (_emptyArray == null) {
           _emptyArray = new ContactLookupResult[0];
         }
@@ -60,20 +62,20 @@ public final class ContactLookupResult extends
   }
 
   @Override
-  public ContactLookupResult mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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;
+        default:
+          {
+            if (!super.storeUnknownField(input, tag)) {
+              return this;
+            }
+            break;
           }
-          break;
-        }
       }
     }
   }
@@ -84,8 +86,7 @@ public final class ContactLookupResult extends
   }
 
   public static ContactLookupResult parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
+      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
index 35d8b8ca1..dbe40cd53 100644
--- a/java/com/android/dialer/logging/nano/ContactSource.java
+++ b/java/com/android/dialer/logging/nano/ContactSource.java
@@ -11,17 +11,19 @@
  * 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
+ * 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> {
+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;
@@ -33,11 +35,11 @@ public final class ContactSource extends
   }
 
   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) {
+      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
         if (_emptyArray == null) {
           _emptyArray = new ContactSource[0];
         }
@@ -59,20 +61,20 @@ public final class ContactSource extends
   }
 
   @Override
-  public ContactSource mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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;
+        default:
+          {
+            if (!super.storeUnknownField(input, tag)) {
+              return this;
+            }
+            break;
           }
-          break;
-        }
       }
     }
   }
@@ -82,8 +84,7 @@ public final class ContactSource extends
     return com.google.protobuf.nano.MessageNano.mergeFrom(new ContactSource(), data);
   }
 
-  public static ContactSource parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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
index 6bb56751f..80a006b55 100644
--- a/java/com/android/dialer/logging/nano/DialerImpression.java
+++ b/java/com/android/dialer/logging/nano/DialerImpression.java
@@ -14,12 +14,16 @@
  * 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> {
+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;
@@ -33,7 +37,8 @@ public final class DialerImpression extends
     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
+        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;
@@ -41,7 +46,8 @@ public final class DialerImpression extends
     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_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;
@@ -89,7 +95,8 @@ public final class DialerImpression extends
     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 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;
@@ -116,15 +123,43 @@ public final class DialerImpression extends
     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 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;
   }
 
   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) {
+      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
         if (_emptyArray == null) {
           _emptyArray = new DialerImpression[0];
         }
@@ -146,20 +181,20 @@ public final class DialerImpression extends
   }
 
   @Override
-  public DialerImpression mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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;
+        default:
+          {
+            if (!super.storeUnknownField(input, tag)) {
+              return this;
+            }
+            break;
           }
-          break;
-        }
       }
     }
   }
@@ -169,10 +204,8 @@ public final class DialerImpression extends
     return com.google.protobuf.nano.MessageNano.mergeFrom(new DialerImpression(), data);
   }
 
-  public static DialerImpression parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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
index 8d9430be9..7ca95fa45 100644
--- a/java/com/android/dialer/logging/nano/InteractionEvent.java
+++ b/java/com/android/dialer/logging/nano/InteractionEvent.java
@@ -23,8 +23,8 @@ package com.android.dialer.logging.nano;
 public final class InteractionEvent
     extends com.google.protobuf.nano.ExtendableMessageNano<InteractionEvent> {
 
-  // enum Type
   /** 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;
diff --git a/java/com/android/dialer/logging/nano/ReportingLocation.java b/java/com/android/dialer/logging/nano/ReportingLocation.java
index 1f05ce414..08ee04e7e 100644
--- a/java/com/android/dialer/logging/nano/ReportingLocation.java
+++ b/java/com/android/dialer/logging/nano/ReportingLocation.java
@@ -11,17 +11,19 @@
  * 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
+ * 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> {
+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;
@@ -30,11 +32,11 @@ public final class ReportingLocation extends
   }
 
   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) {
+      synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
         if (_emptyArray == null) {
           _emptyArray = new ReportingLocation[0];
         }
@@ -56,20 +58,20 @@ public final class ReportingLocation extends
   }
 
   @Override
-  public ReportingLocation mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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;
+        default:
+          {
+            if (!super.storeUnknownField(input, tag)) {
+              return this;
+            }
+            break;
           }
-          break;
-        }
       }
     }
   }
@@ -79,8 +81,7 @@ public final class ReportingLocation extends
     return com.google.protobuf.nano.MessageNano.mergeFrom(new ReportingLocation(), data);
   }
 
-  public static ReportingLocation parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
+  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
index be4e5eb9e..bd5b817e1 100644
--- a/java/com/android/dialer/logging/nano/ScreenEvent.java
+++ b/java/com/android/dialer/logging/nano/ScreenEvent.java
@@ -22,8 +22,8 @@ package com.android.dialer.logging.nano;
 @SuppressWarnings("hiding")
 public final class ScreenEvent extends com.google.protobuf.nano.ExtendableMessageNano<ScreenEvent> {
 
-  // enum Type
   /** This file is autogenerated, but javadoc required. */
+  // enum Type
   public interface Type {
     public static final int UNKNOWN = 0;
     public static final int DIALPAD = 1;