Update Dialer to V10 RC16

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC16
Branch: dialer-android_release_branch/153304843.1
dialer-android/dialer-android_20170416.00/dialer-android_20170416.00_RC16

This release contains the following bug fixes since RC00:
Bug: 37324705 35304403 36067503 35304446 33203808 37280992
37346084 35766990 37481880 37424493 36470282 37347691
37519015 37168472 35805360 37545472 27704934 36515614
35766990 37577470 34739750 35801628 36788693 35264204
36708536 37628370 36904650 37314436 37642171 37530847
37637799 37666625 37548549 37648036 37636412 37323529
37630507 35919141 37198343 37548572 36178218 37640315
37663896 37720467 37275944 37710497 31634477 37744796
37348506 37744796 37568534 37672424 34872683 34873026
37681461 34873295 37748373 37526812 37618638 37663896
37536088 37727455 37165687 36651204 36900708 37323529
36902926 37256480 37328353 37432034 37436952 34093562
37720889 37321935 37780300 37781115 37755902 36588206
34258266 37290464 37698062 37618638 37473004 37432034
37918676 37870494 37722091

Test: make, on device
Change-Id: I99e1a484ccd578c1f8a13e7a6a4b4952f0791297

1 files changed, 56 insertions, 18 deletions

diff --git a/java/com/android/dialer/calllogutils/CallEntryFormatter.java b/java/com/android/dialer/calllogutils/CallEntryFormatter.java
index bd184bb89..6aa93af52 100644
--- a/java/com/android/dialer/calllogutils/CallEntryFormatter.java
+++ b/java/com/android/dialer/calllogutils/CallEntryFormatter.java
@@ -17,6 +17,7 @@
 package com.android.dialer.calllogutils;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.icu.lang.UCharacter;
 import android.icu.text.BreakIterator;
 import android.os.Build.VERSION;
@@ -24,9 +25,12 @@ import android.os.Build.VERSION_CODES;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import com.android.dialer.util.DialerUtils;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 /** Utility class for formatting data and data usage in call log entries. */
 public class CallEntryFormatter {
@@ -76,24 +80,41 @@ public class CallEntryFormatter {
         UCharacter.TITLECASE_NO_LOWERCASE);
   }
 
-  private static CharSequence formatDuration(Context context, long elapsedSeconds, boolean a11y) {
-    long minutes = 0;
-    long seconds = 0;
+  private static CharSequence formatDuration(Context context, long elapsedSeconds) {
+    Resources res = context.getResources();
+    String formatPattern;
+    if (elapsedSeconds >= 60) {
+      String minutesString = res.getString(R.string.call_details_minutes_abbreviation);
+      String secondsString = res.getString(R.string.call_details_seconds_abbreviation);
+      // example output: "1m 1s"
+      formatPattern =
+          context.getString(
+              R.string.call_duration_format_pattern, "m", minutesString, "s", secondsString);
+    } else {
+      String secondsString = res.getString(R.string.call_details_seconds_abbreviation);
+      // example output: "1s"
+      formatPattern =
+          context.getString(R.string.call_duration_short_format_pattern, "s", secondsString);
+    }
+    SimpleDateFormat format = new SimpleDateFormat(formatPattern);
+    return format.format(new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds)));
+  }
 
+  private static CharSequence formatDurationA11y(Context context, long elapsedSeconds) {
+    Resources res = context.getResources();
     if (elapsedSeconds >= 60) {
-      minutes = elapsedSeconds / 60;
-      elapsedSeconds -= minutes * 60;
-      seconds = elapsedSeconds;
-      int stringId =
-          a11y ? R.string.call_details_duration_format_a11y : R.string.call_details_duration_format;
-      return context.getString(stringId, minutes, seconds);
+      int minutes = (int) (elapsedSeconds / 60);
+      int seconds = (int) elapsedSeconds - minutes * 60;
+      String minutesString = res.getQuantityString(R.plurals.a11y_minutes, minutes);
+      String secondsString = res.getQuantityString(R.plurals.a11y_seconds, seconds);
+      // example output: "1 minute 1 second", "2 minutes 2 seconds", ect.
+      return context.getString(
+          R.string.a11y_call_duration_format, minutes, minutesString, seconds, secondsString);
     } else {
-      seconds = elapsedSeconds;
-      int stringId =
-          a11y
-              ? R.string.call_details_short_duration_format_a11y
-              : R.string.call_details_short_duration_format;
-      return context.getString(stringId, seconds);
+      String secondsString = res.getQuantityString(R.plurals.a11y_seconds, (int) elapsedSeconds);
+      // example output: "1 second", "2 seconds"
+      return context.getString(
+          R.string.a11y_call_duration_short_format, elapsedSeconds, secondsString);
     }
   }
 
@@ -102,12 +123,29 @@ 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, boolean a11y) {
-    CharSequence duration = formatDuration(context, elapsedSeconds, a11y);
+      Context context, long elapsedSeconds, long dataUsage) {
+    return formatDurationAndDataUsageInternal(
+        context, formatDuration(context, elapsedSeconds), dataUsage);
+  }
+
+  /**
+   * Formats a string containing the call duration and the data usage (if specified) for TalkBack.
+   *
+   * @param elapsedSeconds Total elapsed seconds.
+   * @param dataUsage Data usage in bytes, or null if not specified.
+   * @return String containing call duration and data usage.
+   */
+  public static CharSequence formatDurationAndDataUsageA11y(
+      Context context, long elapsedSeconds, long dataUsage) {
+    return formatDurationAndDataUsageInternal(
+        context, formatDurationA11y(context, elapsedSeconds), dataUsage);
+  }
+
+  private static CharSequence formatDurationAndDataUsageInternal(
+      Context context, CharSequence duration, long dataUsage) {
     List<CharSequence> durationItems = new ArrayList<>();
     if (dataUsage > 0) {
       durationItems.add(duration);