Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fa65b01 authored by Victor Chang's avatar Victor Chang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "icu70" am: da0880a0 am: 4bd88f5c am: fd779286 am: 14682b1f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914692

Change-Id: I0fc0a3a2afb0f3ec796cdcc686a8796daa194a16
parents b805e0fa 14682b1f

core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java

+17 −17
Original line number Diff line number Diff line
@@ -251,10 +251,10 @@ public class DateIntervalFormatTest { 


        assertEquals("19–22 de enero de 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, 0));

        assertEquals("19–22 de ene. de 2009",

        assertEquals("19–22 de ene de 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY,

                        FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));

        assertEquals("lun, 19 de ene. – jue, 22 de ene. de 2009",

        assertEquals("lun, 19 de ene – jue, 22 de ene de 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY,

                        FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));

        assertEquals("lunes, 19 de enero – jueves, 22 de enero de 2009",
@@ -262,19 +262,19 @@ public class DateIntervalFormatTest { 


        assertEquals("19 de enero – 22 de abril de 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, 0));

        assertEquals("19 de ene. – 22 de abr. 2009",

        assertEquals("19 de ene – 22 de abr 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH,

                        FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));

        assertEquals("lun, 19 de ene. – mié, 22 de abr. de 2009",

        assertEquals("lun, 19 de ene – mié, 22 de abr de 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH,

                        FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));

        assertEquals("enero–abril de 2009",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY));



        assertEquals("19 de ene. de 2009 – 9 de feb. de 2012",

        assertEquals("19 de ene de 2009 – 9 de feb de 2012",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR,

                        FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));

        assertEquals("ene. de 2009 – feb. de 2012",

        assertEquals("ene de 2009 – feb de 2012",

                formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR,

                        FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL));

        assertEquals("19 de enero de 2009 – 9 de febrero de 2012",

libs/androidfw/LocaleDataTables.cpp

+1186 −1176

File changed.

Preview size limit exceeded, changes collapsed.