diff options
Diffstat (limited to 'src/com/android/dialer/calllog')
3 files changed, 22 insertions, 16 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index a8cd72a39..44fad2225 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -28,7 +28,6 @@ import android.os.Message; import android.provider.CallLog.Calls; import android.provider.ContactsContract.PhoneLookup; import android.text.TextUtils; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -42,7 +41,6 @@ import com.android.common.widget.GroupingListAdapter; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest; import com.android.contacts.common.util.UriUtils; -import com.android.dialer.CallDetailActivity; import com.android.dialer.PhoneCallDetails; import com.android.dialer.PhoneCallDetailsHelper; import com.android.dialer.R; @@ -55,7 +53,6 @@ import com.google.common.base.Objects; import java.util.HashMap; import java.util.LinkedList; -import java.util.Map; /** * Adapter class to fill in data for the Call Log. @@ -686,10 +683,7 @@ public class CallLogAdapter extends GroupingListAdapter duration, name, ntype, label, lookupUri, photoUri, sourceType); } - final boolean isNew = c.getInt(CallLogQuery.IS_READ) == 0; - // New items also use the highlighted version of the text. - final boolean isHighlighted = isNew; - mCallLogViewsHelper.setPhoneCallDetails(views, details, isHighlighted); + mCallLogViewsHelper.setPhoneCallDetails(views, details); int contactType = ContactPhotoManager.TYPE_DEFAULT; @@ -1080,6 +1074,19 @@ public class CallLogAdapter extends GroupingListAdapter false /* darkTheme */, true /* isCircular */, request); } + /** + * Bind a call log entry view for testing purposes. Also inflates the action view stub so + * unit tests can access the buttons contained within. + * + * @param view The current call log row. + * @param context The current context. + * @param cursor The cursor to bind from. + */ + @VisibleForTesting + void bindViewForTest(View view, Context context, Cursor cursor) { + bindStandAloneView(view, context, cursor); + inflateActionViewStub(view); + } /** * Sets whether processing of requests for contact details should be enabled. diff --git a/src/com/android/dialer/calllog/CallLogListItemHelper.java b/src/com/android/dialer/calllog/CallLogListItemHelper.java index 81d1a2711..976726d28 100644 --- a/src/com/android/dialer/calllog/CallLogListItemHelper.java +++ b/src/com/android/dialer/calllog/CallLogListItemHelper.java @@ -17,15 +17,12 @@ package com.android.dialer.calllog; import android.content.res.Resources; -import android.provider.CallLog; import android.provider.CallLog.Calls; import android.text.TextUtils; -import android.view.View; import com.android.dialer.PhoneCallDetails; import com.android.dialer.PhoneCallDetailsHelper; import com.android.dialer.R; -import com.android.internal.util.CharSequences; /** * Helper class to fill in the views of a call log entry. @@ -56,12 +53,9 @@ import com.android.internal.util.CharSequences; * * @param views the views to populate * @param details the details of a phone call needed to fill in the data - * @param isHighlighted whether to use the highlight text for the call */ - public void setPhoneCallDetails(CallLogListItemViews views, PhoneCallDetails details, - boolean isHighlighted) { - mPhoneCallDetailsHelper.setPhoneCallDetails(views.phoneCallDetailsViews, details, - isHighlighted); + public void setPhoneCallDetails(CallLogListItemViews views, PhoneCallDetails details) { + mPhoneCallDetailsHelper.setPhoneCallDetails(views.phoneCallDetailsViews, details); // Set the accessibility text for the contact badge views.quickContactView.setContentDescription(getContactBadgeDescription(details)); diff --git a/src/com/android/dialer/calllog/CallLogListItemViews.java b/src/com/android/dialer/calllog/CallLogListItemViews.java index 879647f15..333769d7e 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViews.java +++ b/src/com/android/dialer/calllog/CallLogListItemViews.java @@ -109,10 +109,15 @@ public final class CallLogListItemViews { @NeededForTesting public static CallLogListItemViews createForTest(Context context) { - return new CallLogListItemViews( + CallLogListItemViews views = new CallLogListItemViews( new QuickContactBadge(context), new View(context), PhoneCallDetailsViews.createForTest(context), new TextView(context)); + views.callBackButtonView = new TextView(context); + views.deleteButtonView = new TextView(context); + views.voicemailButtonView = new TextView(context); + views.actionsView = new View(context); + return views; } } |