From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Wed, 3 May 2017 10:27:13 -0700
Subject: This change reflects the Dialer V10 RC00 branch.

RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843

following the instructions at go/dialer-aosp-release.

In this release:

* Removes final apache sources.
* Uses native lite compilation.

More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.

Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f
---
 .../dialer/calllogutils/CallEntryFormatter.java       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'java/com/android/dialer/calllogutils/CallEntryFormatter.java')

diff --git a/java/com/android/dialer/calllogutils/CallEntryFormatter.java b/java/com/android/dialer/calllogutils/CallEntryFormatter.java
index bd6d53f48..bd184bb89 100644
--- a/java/com/android/dialer/calllogutils/CallEntryFormatter.java
+++ b/java/com/android/dialer/calllogutils/CallEntryFormatter.java
@@ -76,7 +76,7 @@ public class CallEntryFormatter {
         UCharacter.TITLECASE_NO_LOWERCASE);
   }
 
-  private static CharSequence formatDuration(Context context, long elapsedSeconds) {
+  private static CharSequence formatDuration(Context context, long elapsedSeconds, boolean a11y) {
     long minutes = 0;
     long seconds = 0;
 
@@ -84,10 +84,16 @@ public class CallEntryFormatter {
       minutes = elapsedSeconds / 60;
       elapsedSeconds -= minutes * 60;
       seconds = elapsedSeconds;
-      return context.getString(R.string.call_details_duration_format, minutes, seconds);
+      int stringId =
+          a11y ? R.string.call_details_duration_format_a11y : R.string.call_details_duration_format;
+      return context.getString(stringId, minutes, seconds);
     } else {
       seconds = elapsedSeconds;
-      return context.getString(R.string.call_details_short_duration_format, seconds);
+      int stringId =
+          a11y
+              ? R.string.call_details_short_duration_format_a11y
+              : R.string.call_details_short_duration_format;
+      return context.getString(stringId, seconds);
     }
   }
 
@@ -96,13 +102,14 @@ public class CallEntryFormatter {
    *
    * @param elapsedSeconds Total elapsed seconds.
    * @param dataUsage Data usage in bytes, or null if not specified.
+   * @param a11y {@code true} if string should be talk back friendly.
    * @return String containing call duration and data usage.
    */
   public static CharSequence formatDurationAndDataUsage(
-      Context context, long elapsedSeconds, Long dataUsage) {
-    CharSequence duration = formatDuration(context, elapsedSeconds);
+      Context context, long elapsedSeconds, long dataUsage, boolean a11y) {
+    CharSequence duration = formatDuration(context, elapsedSeconds, a11y);
     List<CharSequence> durationItems = new ArrayList<>();
-    if (dataUsage != null) {
+    if (dataUsage > 0) {
       durationItems.add(duration);
       durationItems.add(Formatter.formatShortFileSize(context, dataUsage));
       return DialerUtils.join(durationItems);
-- 
cgit v1.2.3