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

Commit 1c2e2f76 authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "icu68" am: e17a1390 am: 714b3ec8 am: e10a7b99 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95bcc68ca268b23524cf327fb2efa6f54df232df
parents 3098553d e10a7b99

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

+8 −8
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ public class DateIntervalFormatTest { 
        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",
@@ -265,7 +265,7 @@ public class DateIntervalFormatTest { 
        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",
@@ -286,9 +286,9 @@ public class DateIntervalFormatTest { 


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

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

        assertEquals("19–22 ene. 2009", formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY,

        assertEquals("19–22 ene 2009", formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY,

                FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));

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

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

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

                        FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));

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


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

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

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

        assertEquals("19 ene – 22 abr 2009",

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

                        FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));

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

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

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

                        FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));

        assertEquals("enero–abril de 2009",

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



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

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

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

                        FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));

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

        assertEquals("ene 2009 – feb 2012",

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

                        FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL));

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

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

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ public class FormatterTest { 


        // Make sure it works on different locales.

        setLocale(new Locale("ru", "RU"));

        assertEquals("1 мин.", Formatter.formatShortElapsedTimeRoundingUpToMinutes(

        assertEquals("1 мин", Formatter.formatShortElapsedTimeRoundingUpToMinutes(

                mContext, 1 * SECOND));

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -755,8 +755,8 @@ public class RelativeDateTimeFormatterTest { 
        final Locale locale = new Locale("fr");

        android.icu.text.RelativeDateTimeFormatter icuFormatter =

                android.icu.text.RelativeDateTimeFormatter.getInstance(locale);

        assertEquals("D à T", icuFormatter.combineDateAndTime("D", "T"));

        assertEquals("D, T", icuFormatter.combineDateAndTime("D", "T"));

        // Ensure single quote ' and curly braces {} are not interpreted in input values.

        assertEquals("D'x' à T{0}", icuFormatter.combineDateAndTime("D'x'", "T{0}"));

        assertEquals("D'x', T{0}", icuFormatter.combineDateAndTime("D'x'", "T{0}"));

    }

}

libs/androidfw/LocaleDataTables.cpp

+102 −93

File changed.

Preview size limit exceeded, changes collapsed.