Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"

This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.

Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.

Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b

1 files changed, 7 insertions, 12 deletions

diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
index 1ddd2e77e..4d9aacf7b 100644
--- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
@@ -25,12 +25,11 @@ import android.view.View.OnClickListener;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.contacts.common.ContactPhotoManager;
+import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
-import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
 
@@ -44,24 +43,20 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder
   private final QuickContactBadge contactPhoto;
   private final Context context;
 
-  private DialerContact contact;
+  private CallComposerContact contact;
 
   CallDetailsHeaderViewHolder(View container) {
     super(container);
     context = container.getContext();
     callBackButton = container.findViewById(R.id.call_back_button);
-    nameView = container.findViewById(R.id.contact_name);
-    numberView = container.findViewById(R.id.phone_number);
-    contactPhoto = container.findViewById(R.id.quick_contact_photo);
-
+    nameView = (TextView) container.findViewById(R.id.contact_name);
+    numberView = (TextView) container.findViewById(R.id.phone_number);
+    contactPhoto = (QuickContactBadge) container.findViewById(R.id.quick_contact_photo);
     callBackButton.setOnClickListener(this);
-    Logger.get(context)
-        .logQuickContactOnTouch(
-            contactPhoto, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_DETAILS, true);
   }
 
   /** Populates the contact info fields based on the current contact information. */
-  void updateContactInfo(DialerContact contact) {
+  void updateContactInfo(CallComposerContact contact) {
     this.contact = contact;
     ContactPhotoManager.getInstance(context)
         .loadDialerThumbnailOrPhoto(
@@ -103,7 +98,7 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder
           view.getContext(),
           new CallIntentBuilder(contact.getNumber(), CallInitiationType.Type.CALL_DETAILS).build());
     } else {
-      throw Assert.createIllegalStateFailException("View OnClickListener not implemented: " + view);
+      Assert.fail("View OnClickListener not implemented: " + view);
     }
   }
 }