diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-11 21:22:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-11 21:22:26 +0000 |
commit | d4d9fb5e6dcaa284c955d112f21cc420f0f7f3f2 (patch) | |
tree | 4d0aa7d6f8a6ded1f9c71f2165113988c8872469 /java/com/android/dialer/calllog | |
parent | 6e714e712a91f7eb3c12ed76ba2482e2714c2bc1 (diff) | |
parent | b175d252b8801c4219343d7bff1b76ca1f2eb030 (diff) |
Merge changes I6db36017,I0f0b44e5
* changes:
Add RTT badge to new call log.
Update logic for incoming and active calls.
Diffstat (limited to 'java/com/android/dialer/calllog')
4 files changed, 17 insertions, 0 deletions
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java index 6b1a9e1f5..5fdf0dfd9 100644 --- a/java/com/android/dialer/calllog/database/Coalescer.java +++ b/java/com/android/dialer/calllog/database/Coalescer.java @@ -203,6 +203,11 @@ public class Coalescer { return false; } + // A RTT call should not be combined with one that is not a RTT call. + if ((row1Features & Calls.FEATURES_RTT) != (row2Features & Calls.FEATURES_RTT)) { + return false; + } + return true; } diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java index 217208d17..d1a654a09 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java @@ -21,6 +21,7 @@ import android.content.res.ColorStateList; import android.database.Cursor; import android.provider.CallLog.Calls; import android.support.annotation.DrawableRes; +import android.support.v4.os.BuildCompat; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; @@ -152,6 +153,9 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) .setFormattedNumber(row.getFormattedNumber()) .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) + .setIsRtt( + BuildCompat.isAtLeastP() + && (row.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT) .setIsVoicemail(row.getIsVoicemailCall()) .build()); } diff --git a/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java index d348541d7..d87888d34 100644 --- a/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java +++ b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java @@ -18,6 +18,7 @@ package com.android.dialer.calllog.ui.menu; import android.content.Context; import android.provider.CallLog.Calls; +import android.support.v4.os.BuildCompat; import com.android.dialer.calllog.model.CoalescedRow; import com.android.dialer.calllogutils.CallLogEntryText; import com.android.dialer.calllogutils.NumberAttributesConverter; @@ -33,6 +34,9 @@ final class BottomSheetHeader { NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) .setFormattedNumber(row.getFormattedNumber()) .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) + .setIsRtt( + BuildCompat.isAtLeastP() + && (row.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT) .build()) .setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString()) .setSecondaryText( diff --git a/java/com/android/dialer/calllog/ui/menu/Modules.java b/java/com/android/dialer/calllog/ui/menu/Modules.java index dd0b0851e..e16de3af1 100644 --- a/java/com/android/dialer/calllog/ui/menu/Modules.java +++ b/java/com/android/dialer/calllog/ui/menu/Modules.java @@ -18,6 +18,7 @@ package com.android.dialer.calllog.ui.menu; import android.content.Context; import android.provider.CallLog.Calls; +import android.support.v4.os.BuildCompat; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.text.TextUtils; @@ -211,6 +212,9 @@ final class Modules { return NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) .setFormattedNumber(row.getFormattedNumber()) .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) + .setIsRtt( + BuildCompat.isAtLeastP() + && (row.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT) .setIsVoicemail(row.getIsVoicemailCall()) .build(); } |