diff options
author | mdooley <mdooley@google.com> | 2017-09-15 10:22:21 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-09-15 12:14:27 -0700 |
commit | 1bd727efdd4cb6c3651ddbe86f4ec8ce826ac419 (patch) | |
tree | 3a0b154618761137d9d71d77275b94b8e497c646 /java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java | |
parent | 235ecb1b43c6afce0880d034f5bd33d2ce61c8ac (diff) |
Updating voicemail TOS UI to match mocks
verizon TOS screen shot 1: https://drive.google.com/open?id=0B9o_KvtLkcuIU3VpLUpqcXBUYy1QY19UUk81a29sdGQyNEZZ
verizon TOS screen shot 2: https://drive.google.com/open?id=0B9o_KvtLkcuIN3R6SUFjS3RVTWhZQUM1UzhoajhNUF9ZbzJJ
non-verizon TOS screen shot: https://drive.google.com/open?id=0B9o_KvtLkcuIeVFYaWhYZmRzYVctU2F6N1VqazcycGpmNmRZ
Bug: 37340510
Test: manual and update unit test
PiperOrigin-RevId: 168851805
Change-Id: I7be27360093cae315b7249152e10d1beae5c5966
Diffstat (limited to 'java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java')
-rw-r--r-- | java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java | 77 |
1 files changed, 56 insertions, 21 deletions
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java index 53f4680d2..9b3bbd08e 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -22,13 +22,17 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Typeface; import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; +import android.text.Layout; import android.text.SpannableString; -import android.text.style.StyleSpan; +import android.text.Spanned; +import android.text.TextUtils; +import android.text.style.AlignmentSpan; +import android.text.style.TextAppearanceSpan; +import android.text.style.URLSpan; import android.view.View; import android.view.View.OnClickListener; import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action; @@ -76,7 +80,6 @@ public class VoicemailTosMessageCreator { @Nullable VoicemailErrorMessage maybeCreateTosMessage() { - // TODO(mdooley): add filtering based on carrier if (hasAcceptedTos()) { return null; } @@ -117,7 +120,7 @@ public class VoicemailTosMessageCreator { }, true /* raised */)) .setModal(true) - .setImageResourceId(getTosImageId()); + .setImageResourceId(R.drawable.voicemail_tos_image); } private boolean shouldShowTos() { @@ -263,9 +266,10 @@ public class VoicemailTosMessageCreator { } private CharSequence getVvm3Tos() { + String policyUrl = context.getString(R.string.verizon_terms_and_conditions_policy_url); return useSpanish() - ? context.getString(R.string.verizon_terms_and_conditions_1_1_spanish) - : context.getString(R.string.verizon_terms_and_conditions_1_1_english); + ? context.getString(R.string.verizon_terms_and_conditions_1_1_spanish, policyUrl) + : context.getString(R.string.verizon_terms_and_conditions_1_1_english, policyUrl); } private CharSequence getDialerTos() { @@ -273,9 +277,10 @@ public class VoicemailTosMessageCreator { return ""; } - return useSpanish() - ? context.getString(R.string.dialer_terms_and_conditions_1_0_spanish) - : context.getString(R.string.dialer_terms_and_conditions_1_0_english); + 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); } private CharSequence getAcceptText() { @@ -309,6 +314,7 @@ public class VoicemailTosMessageCreator { } private CharSequence getTosMessage() { + SpannableString spannableTos; if (isVvm3()) { // For verizon the TOS consist of three pieces: google dialer TOS, Verizon TOS message and // Verizon TOS details. @@ -316,18 +322,51 @@ public class VoicemailTosMessageCreator { CharSequence tos = context.getString( R.string.verizon_terms_and_conditions_message, getDialerTos(), vvm3Details); - // Make all text bold except the details. - SpannableString spannableTos = new SpannableString(tos); - spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length() - vvm3Details.length(), 0); - return spannableTos; + spannableTos = new SpannableString(tos); + // Set the text style for the details part of the TOS + int start = spannableTos.length() - vvm3Details.length(); + spannableTos.setSpan( + new TextAppearanceSpan(context, R.style.TosDetailsTextStyle), + start, + start + vvm3Details.length(), + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + // Add verizon policy link + String linkUrl = context.getString(R.string.verizon_terms_and_conditions_policy_url); + addLink(spannableTos, linkUrl, linkUrl); } else { - // The TOS for everyone else there are no details, so just make everything bold. + // The TOS for everyone else, there are no details, but change to center alignment. CharSequence tos = context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos()); - SpannableString spannableTos = new SpannableString(tos); - spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length(), 0); - return spannableTos; + spannableTos = new SpannableString(tos); + spannableTos.setSpan( + new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER), + 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); + } + + private SpannableString addLink(SpannableString spannable, String linkText, String linkUrl) { + if (TextUtils.isEmpty(linkUrl) || TextUtils.isEmpty(linkText)) { + return spannable; + } + + int start = spannable.toString().indexOf(linkText); + if (start != -1) { + int end = start + linkText.length(); + spannable.setSpan(new URLSpan(linkUrl), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + spannable.setSpan( + new TextAppearanceSpan(context, R.style.TosLinkStyle), + start, + end, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } + return spannable; } private int getTosDeclinedDialogMessageId() { @@ -341,8 +380,4 @@ public class VoicemailTosMessageCreator { ? R.string.verizon_terms_and_conditions_decline_dialog_downgrade : R.string.dialer_terms_and_conditions_decline_dialog_downgrade; } - - private Integer getTosImageId() { - return isVvm3() ? null : R.drawable.voicemail_tos_image; - } } |