From 3e97f65b217c4b9e64c33e083b451ba83f239f6a Mon Sep 17 00:00:00 2001 From: Android Dialer Date: Mon, 19 Mar 2018 18:19:04 -0700 Subject: Show spam blocking promo after block spam dialog Test: SpamBlockingPromoHelperTest PiperOrigin-RevId: 189674918 Change-Id: I0b22eb9b8128125cc5b439674099820a01c3889f --- .../android/dialer/app/calllog/BlockReportSpamListener.java | 13 +++++++++++++ java/com/android/dialer/app/calllog/CallLogAdapter.java | 1 + .../com/android/dialer/app/res/layout/call_log_fragment.xml | 1 + 3 files changed, 15 insertions(+) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java index ecf629e14..5c7641c80 100644 --- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java +++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java @@ -20,6 +20,7 @@ import android.app.FragmentManager; import android.content.Context; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; +import android.view.View; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blockreportspam.BlockReportSpamDialogs; import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForReportingNotSpam; @@ -31,26 +32,32 @@ import com.android.dialer.logging.Logger; import com.android.dialer.logging.ReportingLocation; import com.android.dialer.spam.Spam; import com.android.dialer.spam.SpamComponent; +import com.android.dialer.spam.promo.SpamBlockingPromoHelper; /** Listener to show dialogs for block and report spam actions. */ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClickListener { private final Context context; + private final View rootView; private final FragmentManager fragmentManager; private final RecyclerView.Adapter adapter; private final FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler; private final Spam spam; + private final SpamBlockingPromoHelper spamBlockingPromoHelper; public BlockReportSpamListener( Context context, + View rootView, FragmentManager fragmentManager, RecyclerView.Adapter adapter, FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) { this.context = context; + this.rootView = rootView; this.fragmentManager = fragmentManager; this.adapter = adapter; this.filteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler; spam = SpamComponent.get(context).spam(); + spamBlockingPromoHelper = new SpamBlockingPromoHelper(context, spam); } @Override @@ -85,6 +92,10 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic }, number, countryIso); + + if (isSpamChecked) { + spamBlockingPromoHelper.showSpamBlockingPromoDialog(rootView, fragmentManager); + } }, null) .show(fragmentManager, BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG); @@ -122,6 +133,8 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic }, number, countryIso); + + spamBlockingPromoHelper.showSpamBlockingPromoDialog(rootView, fragmentManager); }, null) .show(fragmentManager, BlockReportSpamDialogs.BLOCK_DIALOG_TAG); diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 7f8c889de..376057ff5 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -564,6 +564,7 @@ public class CallLogAdapter extends GroupingListAdapter blockReportSpamListener = new BlockReportSpamListener( this.activity, + this.activity.findViewById(R.id.call_log_fragment_root), ((Activity) this.activity).getFragmentManager(), this, this.filteredNumberAsyncQueryHandler); diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml index efc08fbb4..f0563967c 100644 --- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml +++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml @@ -16,6 +16,7 @@ -- cgit v1.2.3