diff options
author | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
---|---|---|
committer | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
commit | cded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch) | |
tree | c1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/dialer/calldetails/CallDetailsAdapter.java | |
parent | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff) |
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
Diffstat (limited to 'java/com/android/dialer/calldetails/CallDetailsAdapter.java')
-rw-r--r-- | java/com/android/dialer/calldetails/CallDetailsAdapter.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java index d2fdbb424..725077965 100644 --- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java +++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java @@ -22,26 +22,26 @@ 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}. */ -final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { +public 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 DialerContact contact; + private final CallComposerContact contact; private final List<CallDetailsEntry> callDetailsEntries; private final CallTypeHelper callTypeHelper; - CallDetailsAdapter( + public CallDetailsAdapter( Context context, - @NonNull DialerContact contact, + @NonNull CallComposerContact contact, @NonNull List<CallDetailsEntry> callDetailsEntries) { this.contact = Assert.isNotNull(contact); this.callDetailsEntries = callDetailsEntries; @@ -62,8 +62,8 @@ final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol return new CallDetailsFooterViewHolder( inflater.inflate(R.layout.call_details_footer, parent, false)); default: - throw Assert.createIllegalStateFailException( - "No ViewHolder available for viewType: " + viewType); + Assert.fail("No ViewHolder available for viewType: " + viewType); + return null; } } |