commit ebaf6303bab244e8eb930d19f0e61a2660861812
author Android Dialer <noreply@google.com> Wed May 09 10:58:42 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed May 09 16:57:11 2018 -0700
tree a4aa7bc0c2f19ad5b611ab222e789a9149378260
parent 6d728d52339f4d3bb92f45bb1412cd89f3c318b8

Hide new after call spam blocking promo behind an additional flag.

Test: N/A
PiperOrigin-RevId: 195995975
Change-Id: I0311770eecdf36f275d81ba481098259344cbf5b

java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java

diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
index a117e19..42fb39f 100644
--- a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
+++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
@@ -42,6 +42,8 @@
   static final String SPAM_BLOCKING_PROMO_PERIOD_MILLIS = "spam_blocking_promo_period_millis";
   static final String SPAM_BLOCKING_PROMO_LAST_SHOW_MILLIS = "spam_blocking_promo_last_show_millis";
   public static final String ENABLE_SPAM_BLOCKING_PROMO = "enable_spam_blocking_promo";
+  public static final String ENABLE_AFTER_CALL_SPAM_BLOCKING_PROMO =
+      "enable_after_call_spam_blocking_promo";
 
   private final Context context;
   private final SpamSettings spamSettings;
@@ -77,6 +79,13 @@
     return lastShowMillis == 0 || System.currentTimeMillis() - lastShowMillis > showPeriodMillis;
   }
 
+  /* Returns true if we should show a spam blocking promo in after call notification scenario. */
+  public boolean shouldShowAfterCallSpamBlockingPromo() {
+    return shouldShowSpamBlockingPromo()
+        && ConfigProviderBindings.get(context)
+            .getBoolean(ENABLE_AFTER_CALL_SPAM_BLOCKING_PROMO, false);
+  }
+
   /**
    * Shows a spam blocking promo dialog.
    *

java/com/android/incallui/spam/SpamNotificationActivity.java

diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java
index e10dea3..2cf4868 100644
--- a/java/com/android/incallui/spam/SpamNotificationActivity.java
+++ b/java/com/android/incallui/spam/SpamNotificationActivity.java
@@ -528,7 +528,7 @@
   }
 
   private void maybeShowSpamBlockingPromoAndFinish() {
-    if (!spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {
+    if (!spamBlockingPromoHelper.shouldShowAfterCallSpamBlockingPromo()) {
       finish();
       return;
     }

java/com/android/incallui/spam/SpamNotificationService.java

diff --git a/java/com/android/incallui/spam/SpamNotificationService.java b/java/com/android/incallui/spam/SpamNotificationService.java
index b418ea2..82a943d 100644
--- a/java/com/android/incallui/spam/SpamNotificationService.java
+++ b/java/com/android/incallui/spam/SpamNotificationService.java
@@ -122,7 +122,7 @@
                 ReportingLocation.Type.FEEDBACK_PROMPT,
                 contactLookupResultType);
         new FilteredNumberAsyncQueryHandler(this).blockNumber(null, number, countryIso);
-        if (spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {
+        if (spamBlockingPromoHelper.shouldShowAfterCallSpamBlockingPromo()) {
           spamBlockingPromoHelper.showSpamBlockingPromoNotification(
               notificationTag,
               notificationId,