From bac4da9d520846ab4e4f8cbcbb80927076deec27 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Thu, 7 Jun 2018 17:34:13 -0700
Subject: Wrap phone numbers in custom content descriptions in the new call log
 with TTS span.

Bug: 70989658
Test: Manual (TTS span is not testable)
PiperOrigin-RevId: 199724621
Change-Id: I6dc809660eecdd987ee966f30b68dbbf7bcf2094
---
 java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java | 8 +++-----
 java/com/android/dialer/calllog/ui/res/values/strings.xml    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'java/com/android/dialer/calllog')

diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
index cdc0858da..2377c35ee 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
@@ -304,11 +304,9 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder {
   private void setOnClickListenerForMenuButon(CoalescedRow row) {
     menuButton.setOnClickListener(NewCallLogMenu.createOnClickListener(activity, row));
     menuButton.setContentDescription(
-        activity
-            .getResources()
-            .getString(
-                R.string.a11y_new_call_log_entry_expand_menu,
-                CallLogEntryText.buildPrimaryText(activity, row)));
+        TextUtils.expandTemplate(
+            activity.getResources().getText(R.string.a11y_new_call_log_entry_expand_menu),
+            CallLogEntryText.buildPrimaryText(activity, row)));
   }
 
   private class RealtimeRowFutureCallback implements FutureCallback<CoalescedRow> {
diff --git a/java/com/android/dialer/calllog/ui/res/values/strings.xml b/java/com/android/dialer/calllog/ui/res/values/strings.xml
index 112044f6e..b97a10625 100644
--- a/java/com/android/dialer/calllog/ui/res/values/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/strings.xml
@@ -30,7 +30,7 @@
     [CHAR LIMIT=NONE]
   -->
   <string name="a11y_new_call_log_entry_expand_menu">
-    Expand call log menu for <xliff:g example="Jane Smith" id="primaryTextForEntry">%1$s</xliff:g>
+    Expand call log menu for <xliff:g example="Jane Smith" id="primaryTextForEntry">^1</xliff:g>
   </string>
 
   <!-- Header in call log to group calls from the current day.  [CHAR LIMIT=30] -->
-- 
cgit v1.2.3