Merge "Add TtsSpan to call forwarding details for A11Y" into nyc-dev
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index 01097f4..ef92349 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -12,7 +12,9 @@
import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
+import android.telephony.PhoneNumberUtils;
import android.text.BidiFormatter;
+import android.text.SpannableString;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import android.util.AttributeSet;
@@ -151,18 +153,23 @@
private void updateSummaryText() {
if (isToggled()) {
- CharSequence summaryOn;
final String number = getRawPhoneNumber();
if (number != null && number.length() > 0) {
// Wrap the number to preserve presentation in RTL languages.
String wrappedNumber = BidiFormatter.getInstance().unicodeWrap(
number, TextDirectionHeuristics.LTR);
String values[] = { wrappedNumber };
- summaryOn = TextUtils.replace(mSummaryOnTemplate, SRC_TAGS, values);
+ String summaryOn = String.valueOf(
+ TextUtils.replace(mSummaryOnTemplate, SRC_TAGS, values));
+ int start = summaryOn.indexOf(wrappedNumber);
+
+ SpannableString spannableSummaryOn = new SpannableString(summaryOn);
+ PhoneNumberUtils.addTtsSpan(spannableSummaryOn,
+ start, start + wrappedNumber.length());
+ setSummaryOn(spannableSummaryOn);
} else {
- summaryOn = getContext().getString(R.string.sum_cfu_enabled_no_number);
+ setSummaryOn(getContext().getString(R.string.sum_cfu_enabled_no_number));
}
- setSummaryOn(summaryOn);
}
}