Update Dialer to V10 RC16

am: 10b34a5ebf

Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c

1 files changed, 46 insertions, 12 deletions

diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml
index 22bfb7b93..255990399 100644
--- a/java/com/android/dialer/calllogutils/res/values/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values/strings.xml
@@ -56,6 +56,52 @@
   <!-- Title for blocked call type. [CHAR LIMIT=40] -->
   <string name="type_blocked">Blocked call</string>
 
+  <!-- An abbreviation for minutes. For example "1m" [CHAR LIMIT=NONE] -->
+  <string name="call_details_minutes_abbreviation">m</string>
+
+  <!-- An abbreviation for seconds. For example "28s" [CHAR LIMIT=NONE] -->
+  <string name="call_details_seconds_abbreviation">s</string>
+
+  <!-- A string to announce a call duration. For example, in english might say 2 minutes 15 seconds.
+       This translation may require the variables to be rearranged for grammars different than
+       english. [CHAR LIMIT=NONE] -->
+  <string name="a11y_call_duration_format">
+    <xliff:g id="minutes">%d</xliff:g> <xliff:g id="minutes_translation">%s</xliff:g> <xliff:g id="seconds">%d</xliff:g> <xliff:g id="seconds_translation">%s</xliff:g>
+  </string>
+
+  <!-- A string to announce a call duration. For example, in english might say 15 seconds.
+       This translation may require the variables to be rearranged for grammars different than
+       english. [CHAR LIMIT=NONE] -->
+  <string name="a11y_call_duration_short_format">
+    <xliff:g id="seconds">%d</xliff:g> <xliff:g id="seconds_translation">%s</xliff:g>
+  </string>
+
+  <!-- A pattern to define the layout of a call duration string. for example, in english might
+        say 2m 15s. Translation should only rearrange the inputs. minutes_translation and
+        seconds_translation should remain in \'quotes\'. [CHAR LIMIT=NONE] -->
+  <string name="call_duration_format_pattern">
+    <xliff:g id="minutes_special_character">%s</xliff:g>\'<xliff:g id="minutes_translation">%s</xliff:g>\' <xliff:g id="seconds_special_character">%s</xliff:g>\'<xliff:g id="seconds_translation">%s</xliff:g>\'
+  </string>
+
+  <!-- A pattern to define the layout of a call duration string. for example, in english might
+        say 2m 15s. Translation should only rearrange the inputs. seconds_translation should
+        remain in \'quotes\'. [CHAR LIMIT=NONE] -->
+  <string name="call_duration_short_format_pattern">
+    <xliff:g id="seconds_special_character">%s</xliff:g>\'<xliff:g id="seconds_translation">%s</xliff:g>\'
+  </string>
+
+  <!-- A full string for seconds (time). [CHAR LIMIT=NONE] -->
+  <plurals name="a11y_seconds">
+    <item quantity="one">second</item>
+    <item quantity="other">seconds</item>
+  </plurals>
+
+  <!-- A full string for minutes (time). [CHAR LIMIT=NONE] -->
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="other">minutes</item>
+  </plurals>
+
   <!-- Title for "answered elsewhere" call type. This will happen if a call was ringing
        simultaneously on multiple devices, and the user answered it on a device other than the
        current device. [CHAR LIMIT=60] -->
@@ -81,16 +127,4 @@
 
   <!-- String used for displaying calls to the voicemail number in the call log -->
   <string name="voicemail_string">Voicemail</string>
-
-  <!-- A nicely formatted call duration displayed when viewing call details. For example "42m 28s" -->
-  <string name="call_details_duration_format"><xliff:g example="42" id="minutes">%d</xliff:g>m <xliff:g example="28" id="seconds">%d</xliff:g>s</string>
-
-  <!-- A nicely formatted call duration displayed when viewing call details for duration less than 1 minute. For example "28s" -->
-  <string name="call_details_short_duration_format"><xliff:g example="28" id="seconds">%d</xliff:g>s</string>
-
-  <!-- A call duration announced when viewing call details for accessibility. For example "42 minutes 28 seconds".-->
-  <string name="call_details_duration_format_a11y"><xliff:g example="42" id="minutes">%d</xliff:g> minutes <xliff:g example="28" id="seconds">%d</xliff:g> seconds</string>
-
-  <!-- A call duration announced when viewing call details for accessibility. For example "28 sec" -->
-  <string name="call_details_short_duration_format_a11y"><xliff:g example="28" id="seconds">%d</xliff:g> seconds</string>
 </resources>
\ No newline at end of file