diff options
author | Eric Erfanian <erfanian@google.com> | 2018-04-27 15:32:24 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-27 15:32:24 +0000 |
commit | c28ed7444c25d52fd3996f8edf076a1d740d4e05 (patch) | |
tree | 78f3eaa9f7fcd5ff7cdd5cead74b651d3636e618 /java/com/android/dialer/app | |
parent | 52a161148b057ebd4b0c86228b82cba305f1102d (diff) | |
parent | e7d83218d752f677c859a6c88181d24dc36a8c83 (diff) |
Merge changes I706802c0,I59f9b334,Ica9301f4,I78e0e0fc,I1d574287, ...
* changes:
Show Cequint info in the new call log.
Implement CequintPhoneLookup
Fix impression logging for spam blocking promo dialog shown in after call notification.
Build out the bottom sheet for suggested contacts in Speed Dial.
Fix bug that title of RTT call is not centered.
Add advisory text to RTT call about transcript storage.
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r-- | java/com/android/dialer/app/calllog/BlockReportSpamListener.java | 27 | ||||
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogFragment.java | 2 |
2 files changed, 23 insertions, 6 deletions
diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java index 551791850..987615f5f 100644 --- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java +++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java @@ -206,11 +206,28 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic } private void showSpamBlockingPromoDialog() { - if (spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) { - spamBlockingPromoHelper.showSpamBlockingPromoDialog( - fragmentManager, - success -> spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success), - null /* onDissmissListener */); + if (!spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) { + return; } + + Logger.get(context).logImpression(DialerImpression.Type.SPAM_BLOCKING_CALL_LOG_PROMO_SHOWN); + spamBlockingPromoHelper.showSpamBlockingPromoDialog( + fragmentManager, + () -> { + Logger.get(context) + .logImpression(DialerImpression.Type.SPAM_BLOCKING_ENABLED_THROUGH_CALL_LOG_PROMO); + spamSettings.modifySpamBlockingSetting( + true, + success -> { + if (!success) { + Logger.get(context) + .logImpression( + DialerImpression.Type + .SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_CALL_LOG_PROMO); + } + spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success); + }); + }, + null /* onDismissListener */); } } diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java index 4e968f095..1e55c6358 100644 --- a/java/com/android/dialer/app/calllog/CallLogFragment.java +++ b/java/com/android/dialer/app/calllog/CallLogFragment.java @@ -449,7 +449,7 @@ public class CallLogFragment extends Fragment super.onStart(); CequintCallerIdManager cequintCallerIdManager = null; if (CequintCallerIdManager.isCequintCallerIdEnabled(getContext())) { - cequintCallerIdManager = CequintCallerIdManager.createInstanceForCallLog(); + cequintCallerIdManager = new CequintCallerIdManager(); } contactInfoCache.setCequintCallerIdManager(cequintCallerIdManager); } |