Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0bb4c701: Merge "Use ICU for getDateFormatOrder."

Browse Source 
* commit '0bb4c701bab0f69172417b7a511acb6bdfa052db':
  Use ICU for getDateFormatOrder.
This commit is contained in:
Elliott Hughes
2013-04-30 12:15:00 -07:00
committed by Android Git Automerger
parent e9ae6822a8 0bb4c701ba
commit c2639e58fa
1 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/text/format/DateFormat.java
View File

@@ -313,39 +313,13 @@ public class DateFormat {
* Gets the current date format stored as a char array. The array will contain
* 3 elements ({@link #DATE}, {@link #MONTH}, and {@link #YEAR}) in the order
* specified by the user's format preference. Note that this order is
* only appropriate for all-numeric dates; spelled-out (MEDIUM and LONG)
* <i>only</i> appropriate for all-numeric dates; spelled-out (MEDIUM and LONG)
* dates will generally contain other punctuation, spaces, or words,
* not just the day, month, and year, and not necessarily in the same
* order returned here.
*/
public static char[] getDateFormatOrder(Context context) {
char[] order = new char[] {DATE, MONTH, YEAR};
String value = getDateFormatString(context);
int index = 0;
boolean foundDate = false;
boolean foundMonth = false;
boolean foundYear = false;
for (char c : value.toCharArray()) {
if (!foundDate && (c == DATE)) {
foundDate = true;
order[index] = DATE;
index++;
}
if (!foundMonth && (c == MONTH || c == STANDALONE_MONTH)) {
foundMonth = true;
order[index] = MONTH;
index++;
}
if (!foundYear && (c == YEAR)) {
foundYear = true;
order[index] = YEAR;
index++;
}
}
return order;
return ICU.getDateFormatOrder(getDateFormatString(context));
}
private static String getDateFormatString(Context context) {