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
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
index a2b82c0..63ebd19 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 @@
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 @@
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 @@
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 3df0e66..bf5794b 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 @@
<string translatable="false" name="verizon_domestic_customer_support_display_number">(800) 922–0204</string>
<string name="verizon_terms_and_conditions_title">Turn on visual voicemail</string>
- <string name="verizon_terms_and_conditions_message">%1$s\n\nBy turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s</string>
+ <string name="verizon_terms_and_conditions_message">%1$s By turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s</string>
<string name="dialer_terms_and_conditions_title">Turn on visual voicemail</string>
<string name="dialer_terms_and_conditions_message">%s</string>
@@ -174,10 +174,10 @@
</string>
<string name="dialer_terms_and_conditions_for_verizon_1.0">
- See and listen to your messages, without having to call voicemail. %s
+ See and listen to your messages, without having to call voicemail.
</string>
- <string name="dialer_terms_and_conditions_learn_more">Learn more</string>
+ <string name="dialer_terms_and_conditions_learn_more">Learn more</string>
<!-- TODO(mdooley): STOP SHIP, get real url, b/65734734 -->
<string translatable="false" name="dialer_terms_and_conditions_learn_more_url">https://www.google.com</string>