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

Commit 80a5722b authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Update language in android.text.format to comply with Android’s... 

Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b

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

Change-Id: I85773f31e977e6dd78bc6356fe812d0fbfd4473e
parents 262ad024 f7b2126b

core/java/android/text/format/DateIntervalFormat.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ public final class DateIntervalFormat { 




    /**

    /**

     * Format a date range. This is our slightly more sensible internal API.

     * Format a date range. This is our slightly more sensible internal API.

     * A truly sane replacement would take a skeleton instead of int flags.

     * A truly reasonable replacement would take a skeleton instead of int flags.

     */

     */

    @VisibleForTesting(visibility = PACKAGE)

    @VisibleForTesting(visibility = PACKAGE)

    public static String formatDateRange(ULocale icuLocale, android.icu.util.TimeZone icuTimeZone,

    public static String formatDateRange(ULocale icuLocale, android.icu.util.TimeZone icuTimeZone,