Ensure consistency of capitalization in RelativeDateTimeFormatter

Contains refactoring. Benchmarks below to show no appreciable
negative performance impact to formatters. We do now cache a new
type of formatter.

Benchmarks measured in microseconds on mako.

Before:
DateIntervalFormat_formatDateRange_DATE 244
DateIntervalFormat_formatDateRange_DATE_TIME 256
DateIntervalFormat_formatDateRange_TIME 208

RelativeDateTimeFormatter_getRelativeDateTimeString 207.2
RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 218.2
RelativeDateTimeFormatter_getRelativeTimeSpanString  70.5
RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV  67.4

After:
DateIntervalFormat_formatDateRange_DATE 237
DateIntervalFormat_formatDateRange_DATE_TIME 241
DateIntervalFormat_formatDateRange_TIME 200

RelativeDateTimeFormatter_getRelativeDateTimeString 149.4
RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 161.8
RelativeDateTimeFormatter_getRelativeTimeSpanString  71.7
RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV  69.0

Bug: 20247811
Change-Id: I51075f89ca6b1d8862335e0e5a4d67a5624edfa6

2 files changed, 7 insertions, 5 deletions

diff --git a/benchmarks/src/benchmarks/regression/DateIntervalFormatBenchmark.java b/benchmarks/src/benchmarks/regression/DateIntervalFormatBenchmark.java
index e84c287..e904b4d 100644
--- a/benchmarks/src/benchmarks/regression/DateIntervalFormatBenchmark.java
+++ b/benchmarks/src/benchmarks/regression/DateIntervalFormatBenchmark.java
@@ -21,7 +21,9 @@ import com.google.caliper.SimpleBenchmark;
 import android.icu.util.ULocale;
 import android.icu.util.TimeZone;
 
-import static libcore.icu.DateIntervalFormat.*;
+import libcore.icu.DateIntervalFormat;
+
+import static libcore.icu.DateUtilsBridge.*;
 
 public class DateIntervalFormatBenchmark extends SimpleBenchmark {
   public void timeDateIntervalFormat_formatDateRange_DATE(int reps) throws Exception {
@@ -30,7 +32,7 @@ public class DateIntervalFormatBenchmark extends SimpleBenchmark {
     int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY;
 
     for (int rep = 0; rep < reps; ++rep) {
-      formatDateRange(l, utc, 0L, 0L, flags);
+      DateIntervalFormat.formatDateRange(l, utc, 0L, 0L, flags);
     }
   }
 
@@ -40,7 +42,7 @@ public class DateIntervalFormatBenchmark extends SimpleBenchmark {
     int flags = FORMAT_SHOW_TIME | FORMAT_24HOUR;
 
     for (int rep = 0; rep < reps; ++rep) {
-      formatDateRange(l, utc, 0L, 0L, flags);
+      DateIntervalFormat.formatDateRange(l, utc, 0L, 0L, flags);
     }
   }
 
@@ -50,7 +52,7 @@ public class DateIntervalFormatBenchmark extends SimpleBenchmark {
     int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY | FORMAT_SHOW_TIME | FORMAT_24HOUR;
 
     for (int rep = 0; rep < reps; ++rep) {
-      formatDateRange(l, utc, 0L, 0L, flags);
+      DateIntervalFormat.formatDateRange(l, utc, 0L, 0L, flags);
     }
   }
 }
diff --git a/benchmarks/src/benchmarks/regression/RelativeDateTimeFormatterBenchmark.java b/benchmarks/src/benchmarks/regression/RelativeDateTimeFormatterBenchmark.java
index 30670b4..ea2cf4a 100644
--- a/benchmarks/src/benchmarks/regression/RelativeDateTimeFormatterBenchmark.java
+++ b/benchmarks/src/benchmarks/regression/RelativeDateTimeFormatterBenchmark.java
@@ -21,9 +21,9 @@ import com.google.caliper.SimpleBenchmark;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import static libcore.icu.DateUtilsBridge.FORMAT_ABBREV_RELATIVE;
 import static libcore.icu.RelativeDateTimeFormatter.getRelativeDateTimeString;
 import static libcore.icu.RelativeDateTimeFormatter.getRelativeTimeSpanString;
-import static libcore.icu.RelativeDateTimeFormatter.FORMAT_ABBREV_RELATIVE;
 
 public class RelativeDateTimeFormatterBenchmark extends SimpleBenchmark {
   public void timeRelativeDateTimeFormatter_getRelativeTimeSpanString(int reps) throws Exception {