Use ICU's CLDR data for "AM" and "PM" strings.

This brings DateUtils and Time in sync with bionic, icu, WebKit,
DateFormatSymbols, Formatter, and SimpleDateFormat. And specifically
means that DateUtils now knows how to say "AM" and "PM" in Japanese.

Bug: 6719054

(cherry-pick of b12b61a.)

Conflicts:

	core/res/res/values/public.xml

Change-Id: Ic1a811621a0ec338abd77458ac2046577f87c1e4

Author: enh-google

core/java/android/text/format/DateUtils.java

@@ -29,6 +29,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
+import libcore.icu.LocaleData;
+
 /**
  * This class contains various date-related utilities for creating text for things like
  * elapsed time and date ranges, strings for days of the week and months, and AM/PM text etc.
@@ -128,10 +130,6 @@ public class DateUtils
             com.android.internal.R.string.month_shortest_november,
             com.android.internal.R.string.month_shortest_december,
         };
-    private static final int[] sAmPm = new int[] {
-            com.android.internal.R.string.am,
-            com.android.internal.R.string.pm,
-        };
     private static Configuration sLastConfig;
     private static java.text.DateFormat sStatusTimeFormat;
     private static String sElapsedFormatMMSS;
@@ -359,8 +357,7 @@ public static String getDayOfWeekString(int dayOfWeek, int abbrev) {
      */
     @Deprecated
     public static String getAMPMString(int ampm) {
-        Resources r = Resources.getSystem();
-        return r.getString(sAmPm[ampm - Calendar.AM]);
+        return LocaleData.get(Locale.getDefault()).amPm[ampm - Calendar.AM];
     }
 
     /**

core/java/android/text/format/Time.java

@@ -21,6 +21,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
+import libcore.icu.LocaleData;
+
 /**
  * An alternative to the {@link java.util.Calendar} and
  * {@link java.util.GregorianCalendar} classes. An instance of the Time class represents
@@ -382,8 +384,10 @@ public String format(String format) {
                 sTimeOnlyFormat = r.getString(com.android.internal.R.string.time_of_day);
                 sDateOnlyFormat = r.getString(com.android.internal.R.string.month_day_year);
                 sDateTimeFormat = r.getString(com.android.internal.R.string.date_and_time);
-                sAm = r.getString(com.android.internal.R.string.am);
-                sPm = r.getString(com.android.internal.R.string.pm);
+
+                LocaleData localeData = LocaleData.get(locale);
+                sAm = localeData.amPm[0];
+                sPm = localeData.amPm[1];
 
                 sLocale = locale;
             }

core/res/res/values-af/donottranslate-cldr.xml

@@ -85,9 +85,6 @@
     <string name="day_of_week_shortest_friday">6</string>
     <string name="day_of_week_shortest_saturday">7</string>
 
-    <string name="am">vm.</string>
-    <string name="pm">nm.</string>
-
     <string name="hour_minute_24">%-k:%M</string>
     <string name="hour_minute_ampm">%-l:%M %p</string>
     <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

core/res/res/values-am/donottranslate-cldr.xml

@@ -85,9 +85,6 @@
     <string name="day_of_week_shortest_friday">ዓ</string>
     <string name="day_of_week_shortest_saturday">ቅ</string>
 
-    <string name="am">ጡዋት</string>
-    <string name="pm">ከሳዓት</string>
-
     <string name="hour_minute_24">%-k:%M</string>
     <string name="hour_minute_ampm">%-l:%M %p</string>
     <string name="hour_minute_cap_ampm">%-l:%M %p</string>

core/res/res/values-ar-rEG/donottranslate-cldr.xml

@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ج</string>
     <string name="day_of_week_shortest_saturday">س</string>
 
-    <string name="am">ص</string>
-    <string name="pm">م</string>
     <string name="yesterday">أمس</string>
     <string name="today">اليوم</string>
     <string name="tomorrow">غدًا</string>

core/res/res/values-ar/donottranslate-cldr.xml

@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">ج</string>
     <string name="day_of_week_shortest_saturday">س</string>
 
-    <string name="am">ص</string>
-    <string name="pm">م</string>
     <string name="yesterday">أمس</string>
     <string name="today">اليوم</string>
     <string name="tomorrow">غدًا</string>

core/res/res/values-be/donottranslate-cldr.xml

@@ -74,8 +74,6 @@
     <string name="day_of_week_shortest_friday">п</string>
     <string name="day_of_week_shortest_saturday">с</string>
 
-    <string name="am">да палудня</string>
-    <string name="pm">пасля палудня</string>
     <string name="yesterday">учора</string>
     <string name="today">сёння</string>
     <string name="tomorrow">заўтра</string>

core/res/res/values-bg/donottranslate-cldr.xml

@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">п</string>
     <string name="day_of_week_shortest_saturday">с</string>
 
-    <string name="am">пр. об.</string>
-    <string name="pm">сл. об.</string>
     <string name="yesterday">Вчера</string>
     <string name="today">Днес</string>
     <string name="tomorrow">Утре</string>

core/res/res/values-ca-rES/donottranslate-cldr.xml

@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">v</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">a.m.</string>
-    <string name="pm">p.m.</string>
     <string name="yesterday">ahir</string>
     <string name="today">avui</string>
     <string name="tomorrow">demà</string>

core/res/res/values-ca/donottranslate-cldr.xml

@@ -85,8 +85,6 @@
     <string name="day_of_week_shortest_friday">v</string>
     <string name="day_of_week_shortest_saturday">s</string>
 
-    <string name="am">a.m.</string>
-    <string name="pm">p.m.</string>
     <string name="yesterday">ahir</string>
     <string name="today">avui</string>
     <string name="tomorrow">demà</string>