Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

2 files changed, 17 insertions, 181 deletions

diff --git a/java/com/android/dialer/multimedia/AutoValue_MultimediaData.java b/java/com/android/dialer/multimedia/AutoValue_MultimediaData.java
deleted file mode 100644
index cc6815094..000000000
--- a/java/com/android/dialer/multimedia/AutoValue_MultimediaData.java
+++ /dev/null
@@ -1,165 +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
- */
-
-package com.android.dialer.multimedia;
-
-import android.location.Location;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import javax.annotation.Generated;
-
-@Generated("com.google.auto.value.processor.AutoValueProcessor")
- final class AutoValue_MultimediaData extends MultimediaData {
-
-  private final String subject;
-  private final Location location;
-  private final Uri imageUri;
-  private final String imageContentType;
-  private final boolean important;
-
-  private AutoValue_MultimediaData(
-      @Nullable String subject,
-      @Nullable Location location,
-      @Nullable Uri imageUri,
-      @Nullable String imageContentType,
-      boolean important) {
-    this.subject = subject;
-    this.location = location;
-    this.imageUri = imageUri;
-    this.imageContentType = imageContentType;
-    this.important = important;
-  }
-
-  @Nullable
-  @Override
-  public String getSubject() {
-    return subject;
-  }
-
-  @Nullable
-  @Override
-  public Location getLocation() {
-    return location;
-  }
-
-  @Nullable
-  @Override
-  public Uri getImageUri() {
-    return imageUri;
-  }
-
-  @Nullable
-  @Override
-  public String getImageContentType() {
-    return imageContentType;
-  }
-
-  @Override
-  public boolean isImportant() {
-    return important;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof MultimediaData) {
-      MultimediaData that = (MultimediaData) o;
-      return ((this.subject == null) ? (that.getSubject() == null) : this.subject.equals(that.getSubject()))
-           && ((this.location == null) ? (that.getLocation() == null) : this.location.equals(that.getLocation()))
-           && ((this.imageUri == null) ? (that.getImageUri() == null) : this.imageUri.equals(that.getImageUri()))
-           && ((this.imageContentType == null) ? (that.getImageContentType() == null) : this.imageContentType.equals(that.getImageContentType()))
-           && (this.important == that.isImportant());
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= (subject == null) ? 0 : this.subject.hashCode();
-    h *= 1000003;
-    h ^= (location == null) ? 0 : this.location.hashCode();
-    h *= 1000003;
-    h ^= (imageUri == null) ? 0 : this.imageUri.hashCode();
-    h *= 1000003;
-    h ^= (imageContentType == null) ? 0 : this.imageContentType.hashCode();
-    h *= 1000003;
-    h ^= this.important ? 1231 : 1237;
-    return h;
-  }
-
-  static final class Builder extends MultimediaData.Builder {
-    private String subject;
-    private Location location;
-    private Uri imageUri;
-    private String imageContentType;
-    private Boolean important;
-    Builder() {
-    }
-    private Builder(MultimediaData source) {
-      this.subject = source.getSubject();
-      this.location = source.getLocation();
-      this.imageUri = source.getImageUri();
-      this.imageContentType = source.getImageContentType();
-      this.important = source.isImportant();
-    }
-    @Override
-    public MultimediaData.Builder setSubject(@Nullable String subject) {
-      this.subject = subject;
-      return this;
-    }
-    @Override
-    public MultimediaData.Builder setLocation(@Nullable Location location) {
-      this.location = location;
-      return this;
-    }
-    @Override
-    MultimediaData.Builder setImageUri(@Nullable Uri imageUri) {
-      this.imageUri = imageUri;
-      return this;
-    }
-    @Override
-    MultimediaData.Builder setImageContentType(@Nullable String imageContentType) {
-      this.imageContentType = imageContentType;
-      return this;
-    }
-    @Override
-    public MultimediaData.Builder setImportant(boolean important) {
-      this.important = important;
-      return this;
-    }
-    @Override
-    public MultimediaData build() {
-      String missing = "";
-      if (this.important == null) {
-        missing += " important";
-      }
-      if (!missing.isEmpty()) {
-        throw new IllegalStateException("Missing required properties:" + missing);
-      }
-      return new AutoValue_MultimediaData(
-          this.subject,
-          this.location,
-          this.imageUri,
-          this.imageContentType,
-          this.important);
-    }
-  }
-
-}
diff --git a/java/com/android/dialer/multimedia/MultimediaData.java b/java/com/android/dialer/multimedia/MultimediaData.java
index ebd41a918..22bb7641c 100644
--- a/java/com/android/dialer/multimedia/MultimediaData.java
+++ b/java/com/android/dialer/multimedia/MultimediaData.java
@@ -21,10 +21,10 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.LogUtil;
+import com.google.auto.value.AutoValue;
 
-
-/** Holds the data associated with an enriched call session. */
-
+/** Holds data associated with a call. */
+@AutoValue
 public abstract class MultimediaData {
 
   public static final MultimediaData EMPTY = builder().build();
@@ -34,32 +34,33 @@ public abstract class MultimediaData {
     return new AutoValue_MultimediaData.Builder().setImportant(false);
   }
 
-  /** Returns the call composer subject if set, or null if this isn't a call composer session. */
+  /**
+   * Returns the text part of this data.
+   *
+   * <p>This field is used for both the call composer session and the post call note.
+   */
   @Nullable
-  public abstract String getSubject();
+  public abstract String getText();
 
-  /** Returns the call composer location if set, or null if this isn't a call composer session. */
+  /** Returns the location part of this data. */
   @Nullable
   public abstract Location getLocation();
 
-  /** Returns {@code true} if this session contains image data. */
+  /** Returns {@code true} if this object contains image data. */
   public boolean hasImageData() {
     // imageUri and content are always either both null or nonnull
     return getImageUri() != null && getImageContentType() != null;
   }
 
-  /** Returns the call composer photo if set, or null if this isn't a call composer session. */
+  /** Returns the image uri part of this object's image. */
   @Nullable
   public abstract Uri getImageUri();
 
-  /**
-   * Returns the content type of the image, either image/png or image/jpeg, if set, or null if this
-   * isn't a call composer session.
-   */
+  /** Returns the content type part of this object's image, either image/png or image/jpeg. */
   @Nullable
   public abstract String getImageContentType();
 
-  /** Returns {@code true} if this is a call composer session that's marked as important. */
+  /** Returns {@code true} if this data is marked as important. */
   public abstract boolean isImportant();
 
   /** Returns the string form of this MultimediaData with no PII. */
@@ -68,7 +69,7 @@ public abstract class MultimediaData {
     return String.format(
         "MultimediaData{subject: %s, location: %s, imageUrl: %s, imageContentType: %s, "
             + "important: %b}",
-        LogUtil.sanitizePii(getSubject()),
+        LogUtil.sanitizePii(getText()),
         LogUtil.sanitizePii(getLocation()),
         LogUtil.sanitizePii(getImageUri()),
         getImageContentType(),
@@ -76,10 +77,10 @@ public abstract class MultimediaData {
   }
 
   /** Creates instances of {@link MultimediaData}. */
-
+  @AutoValue.Builder
   public abstract static class Builder {
 
-    public abstract Builder setSubject(@NonNull String subject);
+    public abstract Builder setText(@NonNull String subject);
 
     public abstract Builder setLocation(@NonNull Location location);