diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-29 01:04:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-29 01:04:55 +0000 |
commit | 1b3cf4d73e692182efc3a87e1582505438309283 (patch) | |
tree | b7b71bea6349e97306c9cecc200240c89a167eef /java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java | |
parent | d72585b40d67560cb868c2ac4d6fbda2ed27454b (diff) | |
parent | 57751c35a0d4f25a817378b0a4b1d14336a0d4e8 (diff) |
Merge changes Ib658efa6,I0f84f15c
* changes:
Create a common widget (ContactPhotoView) for a contact photo and its optional badge.
Remove unnecessary call to StatusBarNotifier.updateNotification().
Diffstat (limited to 'java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java')
-rw-r--r-- | java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java index aa71ec4e1..9809d97f5 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java @@ -24,9 +24,7 @@ import android.support.annotation.DrawableRes; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; -import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.QuickContactBadge; import android.widget.TextView; import com.android.dialer.calllog.model.CoalescedRow; import com.android.dialer.calllog.ui.menu.NewCallLogMenu; @@ -39,6 +37,7 @@ import com.android.dialer.compat.telephony.TelephonyManagerCompat; import com.android.dialer.glidephotomanager.GlidePhotoManager; import com.android.dialer.oem.MotorolaUtils; import com.android.dialer.time.Clock; +import com.android.dialer.widget.ContactPhotoView; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import java.util.Locale; @@ -48,11 +47,10 @@ import java.util.concurrent.ExecutorService; final class NewCallLogViewHolder extends RecyclerView.ViewHolder { private final Context context; + private final ContactPhotoView contactPhotoView; private final TextView primaryTextView; private final TextView callCountTextView; private final TextView secondaryTextView; - private final QuickContactBadge contactPhoto; - private final FrameLayout contactBadgeContainer; private final ImageView callTypeIcon; private final ImageView hdIcon; private final ImageView wifiIcon; @@ -75,11 +73,10 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { GlidePhotoManager glidePhotoManager) { super(view); this.context = view.getContext(); + contactPhotoView = view.findViewById(R.id.contact_photo_view); primaryTextView = view.findViewById(R.id.primary_text); callCountTextView = view.findViewById(R.id.call_count); secondaryTextView = view.findViewById(R.id.secondary_text); - contactPhoto = view.findViewById(R.id.quick_contact_photo); - contactBadgeContainer = view.findViewById(R.id.contact_badge_container); callTypeIcon = view.findViewById(R.id.call_type_icon); hdIcon = view.findViewById(R.id.hd_icon); wifiIcon = view.findViewById(R.id.wifi_icon); @@ -154,20 +151,12 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { } private void setPhoto(CoalescedRow row) { - glidePhotoManager.loadQuickContactBadge( - contactPhoto, + contactPhotoView.setPhoto( NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) .setFormattedNumber(row.getFormattedNumber()) + .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) .setIsVoicemail(row.getIsVoicemailCall()) .build()); - - contactBadgeContainer.setVisibility( - shouldShowVideoCallIcon(row) ? View.VISIBLE : View.INVISIBLE); - } - - private static boolean shouldShowVideoCallIcon(CoalescedRow row) { - return (row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO - && !row.getNumberAttributes().getIsSpam(); } private void setFeatureIcons(CoalescedRow row) { |