From cb52c4c1358add154fc7532f368893166247da9b Mon Sep 17 00:00:00 2001 From: mdooley Date: Wed, 4 Oct 2017 10:16:46 -0700 Subject: Remove 'learn more' link from verizon voicemail TOS text and using non-breaking space in dialer TOS 'learn more' link. screen shots: https://drive.google.com/open?id=0B9o_KvtLkcuIV3BWWmxSTTlJQ2dBTnR2UHRGWjZJRlFQUGo0 https://drive.google.com/open?id=0B9o_KvtLkcuIOEJjanVhMXlfck81aU02Y0I2MkVtWFNOVGp3 Bug: 67379747 Test: manual and updated unit tests PiperOrigin-RevId: 171025914 Change-Id: I9c4bfd899805681492a5063ee1bc674bbb98f630 --- .../error/VoicemailTosMessageCreator.java | 22 ++++++++++++---------- .../app/voicemail/error/res/values/strings.xml | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java index a2b82c0fc..63ebd1959 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -304,10 +304,12 @@ public class VoicemailTosMessageCreator { return ""; } - String learnMoreText = context.getString(R.string.dialer_terms_and_conditions_learn_more); - return isVvm3() - ? context.getString(R.string.dialer_terms_and_conditions_for_verizon_1_0, learnMoreText) - : context.getString(R.string.dialer_terms_and_conditions_1_0, learnMoreText); + if (isVvm3()) { + return context.getString(R.string.dialer_terms_and_conditions_for_verizon_1_0); + } else { + String learnMoreText = context.getString(R.string.dialer_terms_and_conditions_learn_more); + return context.getString(R.string.dialer_terms_and_conditions_1_0, learnMoreText); + } } private CharSequence getAcceptText() { @@ -359,7 +361,7 @@ public class VoicemailTosMessageCreator { Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); // Add verizon policy link String linkUrl = context.getString(R.string.verizon_terms_and_conditions_policy_url); - addLink(spannableTos, linkUrl, linkUrl); + return addLink(spannableTos, linkUrl, linkUrl); } else { // The TOS for everyone else, there are no details, but change to center alignment. CharSequence tos = @@ -370,12 +372,12 @@ public class VoicemailTosMessageCreator { 0, tos.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - } - // Add 'Learn more' link for dialer TOS - String learnMore = context.getString(R.string.dialer_terms_and_conditions_learn_more); - String linkUrl = context.getString(R.string.dialer_terms_and_conditions_learn_more_url); - return addLink(spannableTos, learnMore, linkUrl); + // Add 'Learn more' link for dialer TOS + String learnMore = context.getString(R.string.dialer_terms_and_conditions_learn_more); + String linkUrl = context.getString(R.string.dialer_terms_and_conditions_learn_more_url); + return addLink(spannableTos, learnMore, linkUrl); + } } private SpannableString addLink(SpannableString spannable, String linkText, String linkUrl) { diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index 3df0e6660..bf5794b0b 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -137,7 +137,7 @@ (800) 922–0204 Turn on visual voicemail - %1$s\n\nBy turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s + %1$s By turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s Turn on visual voicemail %s @@ -174,10 +174,10 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual - See and listen to your messages, without having to call voicemail. %s + See and listen to your messages, without having to call voicemail. - Learn more + Learn more https://www.google.com -- cgit v1.2.3 From 665bd416945c0c089f78d733e45d7532eb74f5b4 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Wed, 4 Oct 2017 15:10:41 -0700 Subject: Inserting post call notes now compares notifications using fuzzy matching. Bug: 65559651 Test: MissedCallNotifierTest PiperOrigin-RevId: 171070314 Change-Id: I57e6e0b55a07430daad944473ae4eb427d56ee96 --- java/com/android/dialer/app/calllog/MissedCallNotifier.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java index 084713fdc..eb7fab8fc 100644 --- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java +++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java @@ -49,6 +49,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.DialerExecutor.Worker; import com.android.dialer.compat.android.provider.VoicemailCompat; +import com.android.dialer.enrichedcall.FuzzyPhoneNumberMatcher; import com.android.dialer.notification.DialerNotificationManager; import com.android.dialer.notification.NotificationChannelId; import com.android.dialer.notification.NotificationManagerUtils; @@ -267,7 +268,8 @@ public class MissedCallNotifier implements Worker, Void> { List newCalls = callLogNotificationsQueryHelper.getNewMissedCalls(); if (newCalls != null && !newCalls.isEmpty()) { for (NewCall call : newCalls) { - if (call.number.equals(number.replace("tel:", ""))) { + if (FuzzyPhoneNumberMatcher.matches(call.number, number.replace("tel:", ""))) { + LogUtil.i("MissedCallNotifier.insertPostCallNotification", "Notification updated"); // Update the first notification that matches our post call note sender. DialerNotificationManager.notify( context, -- cgit v1.2.3