summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app
diff options
context:
space:
mode:
authormaxwelb <maxwelb@google.com>2018-03-15 15:04:58 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-15 15:58:22 -0700
commite1c143a195540baf5ddc2525129ced08cddccbc0 (patch)
tree2ef46337a9e249d8ed0fcdc48b7b4b3473a6caef /java/com/android/dialer/app
parentfae1ecb6de6a1ae54ca5de92152c03a64ec1b09a (diff)
Add utility used to style content with learn more links
Bug: 74017355 Test: ContentWithLearnMoreSpannerTest PiperOrigin-RevId: 189252365 Change-Id: I3464fb56b86a6b3ddd25e9eed14152eaeed9925c
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r--java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java22
-rw-r--r--java/com/android/dialer/app/res/values/strings.xml5
2 files changed, 6 insertions, 21 deletions
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
index 1f27e5b69..937f0419b 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
@@ -28,12 +28,9 @@ import android.support.v4.content.ContextCompat;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.text.SpannableString;
-import android.text.Spanned;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.method.LinkMovementMethod;
-import android.text.style.TextAppearanceSpan;
-import android.text.style.URLSpan;
import android.text.util.Linkify;
import android.util.TypedValue;
import android.view.Gravity;
@@ -50,6 +47,7 @@ import com.android.dialer.compat.telephony.TelephonyManagerCompat;
import com.android.dialer.logging.ContactSource;
import com.android.dialer.oem.MotorolaUtils;
import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.spannable.ContentWithLearnMoreSpanner;
import com.android.dialer.storage.StorageComponent;
import com.android.dialer.util.DialerUtils;
import com.android.voicemail.VoicemailClient;
@@ -327,7 +325,6 @@ public class PhoneCallDetailsHelper
builder.setCancelable(true);
AlertDialog dialog = builder.create();
- // Use a custom title to prevent truncation, sigh
TextView title = new TextView(context);
title.setText(R.string.voicemail_donation_promo_title);
@@ -378,19 +375,10 @@ public class PhoneCallDetailsHelper
}
private SpannableString getVoicemailDonationPromoContent() {
- CharSequence content = context.getString(R.string.voicemail_donation_promo_content);
- CharSequence learnMore = context.getString(R.string.voicemail_donation_promo_learn_more);
- String learnMoreUrl = context.getString(R.string.voicemail_donation_promo_learn_more_url);
- SpannableString span = new SpannableString(content + " " + learnMore);
- int end = span.length();
- int start = end - learnMore.length();
- span.setSpan(new URLSpan(learnMoreUrl), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- span.setSpan(
- new TextAppearanceSpan(context, R.style.PromoLinkStyle),
- start,
- end,
- Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- return span;
+ return new ContentWithLearnMoreSpanner(context)
+ .create(
+ context.getString(R.string.voicemail_donation_promo_content),
+ context.getString(R.string.voicemail_donation_promo_learn_more_url));
}
@Override
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 047f9e375..7c883299c 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -680,12 +680,9 @@
[CHAR LIMIT=NONE] -->
<string name="voicemail_donation_promo_content">
Let Google review this and future voicemail messages with transcripts.
- They\'ll be stored anonymously. Change Settings anytime.
+ They\'ll be stored anonymously. Change Settings any time. <xliff:g example="Learn more">%1$s</xliff:g>
</string>
- <!-- Text for a 'learn more' link at the end of the voicemail donation promo dialog content -->
- <string name="voicemail_donation_promo_learn_more">Learn&#160;more</string>
-
<string translatable="false" name="voicemail_donation_promo_learn_more_url">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string>
<!-- Label for the voicemail donation promo dialog opt-in button