From 810d43daa31bf481f09c9ed46ac020d6e7c685d3 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Wed, 9 May 2018 16:43:35 -0700
Subject: Add RTT after call promo bottomsheet.

Bug: 67596257
Test: unit tests
PiperOrigin-RevId: 196049621
Change-Id: I6f9c6292b1d56e3faf7808aa668b03d07230a70b
---
 java/com/android/dialer/calllog/ui/NewCallLogAdapter.java             | 4 ++++
 .../dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml | 2 +-
 java/com/android/dialer/calllog/ui/res/values/strings.xml             | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
index 7fd8132aa..69cc02be4 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
@@ -31,6 +31,7 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.promotion.RttPromotion;
 import com.android.dialer.storage.StorageComponent;
 import com.android.dialer.time.Clock;
 import java.lang.annotation.Retention;
@@ -173,6 +174,9 @@ final class NewCallLogAdapter extends RecyclerView.Adapter<ViewHolder> {
   }
 
   private boolean shouldShowDuoDisclosureCard() {
+    if (new RttPromotion(activity).shouldShow()) {
+      return false;
+    }
     // Don't show the Duo disclosure card if
     // (1) Duo integration is not enabled on the device, or
     // (2) Duo is not activated.
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
index 1e24c8ba2..a28101c6f 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
@@ -68,7 +68,7 @@
           android:layout_gravity="end"
           android:paddingLeft="14dp"
           android:paddingRight="14dp"
-          android:text="@string/new_call_log_duo_disclosure_card_ok"
+          android:text="@string/ok_got_it"
           android:textSize="14sp"/>
     </LinearLayout>
   </LinearLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/values/strings.xml b/java/com/android/dialer/calllog/ui/res/values/strings.xml
index f04bffa3f..ec8d59503 100644
--- a/java/com/android/dialer/calllog/ui/res/values/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/strings.xml
@@ -36,7 +36,4 @@
     Google Duo video calling lets you chat with friends and family face-to-face. Data charges may apply. <xliff:g example="Learn More">%1$s</xliff:g>
   </string>
 
-  <!-- Text on the button on the Duo disclosure card. [CHAR_LIMIT=30] -->
-  <string name="new_call_log_duo_disclosure_card_ok">OK, got it</string>
-
 </resources>
-- 
cgit v1.2.3