From b175d252b8801c4219343d7bff1b76ca1f2eb030 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Wed, 11 Apr 2018 12:45:07 -0700
Subject: Add RTT badge to new call log.

Bug: 77717594
Test: ContactPhotoViewTest
PiperOrigin-RevId: 192492913
Change-Id: I6db36017fde2cf9dca580d60d5c88bf2ad2dfe16
---
 java/com/android/dialer/calllog/database/Coalescer.java        | 5 +++++
 java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java   | 4 ++++
 java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java | 4 ++++
 java/com/android/dialer/calllog/ui/menu/Modules.java           | 4 ++++
 4 files changed, 17 insertions(+)

(limited to 'java/com/android/dialer/calllog')

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();
   }
-- 
cgit v1.2.3