am 36f47885: am 90181ef5: am 42602143: Merge "Add a short date format that\'s guaranteed to have 4-digit years."
* commit '36f47885472f6a8829f5ddf880e6a0136bae879e':
Add a short date format that's guaranteed to have 4-digit years.
diff --git a/luni/src/main/java/libcore/icu/LocaleData.java b/luni/src/main/java/libcore/icu/LocaleData.java
index 7a8607b..a6d700f 100644
--- a/luni/src/main/java/libcore/icu/LocaleData.java
+++ b/luni/src/main/java/libcore/icu/LocaleData.java
@@ -79,6 +79,10 @@
public String mediumDateFormat;
public String shortDateFormat;
+ // shortDateFormat, but guaranteed to have 4-digit years.
+ // Used by android.text.format.DateFormat.getDateFormatStringForSetting.
+ public String shortDateFormat4;
+
// Used by android.text.format.DateFormat.getTimeFormat.
public String timeFormat12; // "hh:mm a"
public String timeFormat24; // "HH:mm"
@@ -187,6 +191,7 @@
// accidentally eat too much.
localeData.integerPattern = localeData.numberPattern.replaceAll("\\.[#,]*", "");
}
+ localeData.shortDateFormat4 = localeData.shortDateFormat.replaceAll("\\byy\\b", "y");
return localeData;
}
}