From 2f1c7586bcce334ca69022eb8dc6d8965ceb6a05 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 19 Jun 2017 11:26:01 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/159428781.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/152373142 (4/06/2017) to cl/159428781 (6/19/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
---
 .../dialer/calldetails/CallDetailsAdapter.java      | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'java/com/android/dialer/calldetails/CallDetailsAdapter.java')

diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
index 725077965..48e9b6998 100644
--- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java
+++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
@@ -22,29 +22,32 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.calllogutils.CallTypeHelper;
 import com.android.dialer.common.Assert;
+import com.android.dialer.dialercontact.DialerContact;
 import java.util.List;
 
 /** Adapter for RecyclerView in {@link CallDetailsActivity}. */
-public class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
   private static final int HEADER_VIEW_TYPE = 1;
   private static final int CALL_ENTRY_VIEW_TYPE = 2;
   private static final int FOOTER_VIEW_TYPE = 3;
 
-  private final CallComposerContact contact;
+  private final DialerContact contact;
   private final List<CallDetailsEntry> callDetailsEntries;
+  private final CallDetailsFooterViewHolder.ReportCallIdListener listener;
   private final CallTypeHelper callTypeHelper;
 
-  public CallDetailsAdapter(
+  CallDetailsAdapter(
       Context context,
-      @NonNull CallComposerContact contact,
-      @NonNull List<CallDetailsEntry> callDetailsEntries) {
+      @NonNull DialerContact contact,
+      @NonNull List<CallDetailsEntry> callDetailsEntries,
+      CallDetailsFooterViewHolder.ReportCallIdListener listener) {
     this.contact = Assert.isNotNull(contact);
     this.callDetailsEntries = callDetailsEntries;
+    this.listener = listener;
     callTypeHelper = new CallTypeHelper(context.getResources());
   }
 
@@ -60,10 +63,10 @@ public class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             inflater.inflate(R.layout.call_details_entry, parent, false));
       case FOOTER_VIEW_TYPE:
         return new CallDetailsFooterViewHolder(
-            inflater.inflate(R.layout.call_details_footer, parent, false));
+            inflater.inflate(R.layout.call_details_footer, parent, false), listener);
       default:
-        Assert.fail("No ViewHolder available for viewType: " + viewType);
-        return null;
+        throw Assert.createIllegalStateFailException(
+            "No ViewHolder available for viewType: " + viewType);
     }
   }
 
-- 
cgit v1.2.3