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

Commit 3db0441e authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

Merge "Remove the duplicated constant declaration in DateUtilsBridge"

parents 6e706c4c 6a691eee

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


package android.text.format;



import static android.text.format.DateUtilsBridge.FORMAT_UTC;

import static android.text.format.DateUtils.FORMAT_SHOW_TIME;

import static android.text.format.DateUtils.FORMAT_UTC;



import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;
@@ -84,8 +85,7 @@ public final class DateIntervalFormat { 
        // This is not the behavior of icu4j's DateIntervalFormat, but it's the required behavior

        // of Android's DateUtils.formatDateRange.

        if (isExactlyMidnight(endCalendar)) {

            boolean showTime =

                    (flags & DateUtilsBridge.FORMAT_SHOW_TIME) == DateUtilsBridge.FORMAT_SHOW_TIME;

            boolean showTime = (flags & FORMAT_SHOW_TIME) == FORMAT_SHOW_TIME;

            boolean endsDayAfterStart = DateUtilsBridge.dayDistance(startCalendar, endCalendar)

                    == 1;

            if ((!showTime && startMs != endMs)

core/java/android/text/format/DateUtilsBridge.java

+14 −18
Original line number Diff line number Diff line
@@ -16,6 +16,20 @@ 


package android.text.format;



import static android.text.format.DateUtils.FORMAT_12HOUR;

import static android.text.format.DateUtils.FORMAT_24HOUR;

import static android.text.format.DateUtils.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtils.FORMAT_ABBREV_TIME;

import static android.text.format.DateUtils.FORMAT_ABBREV_WEEKDAY;

import static android.text.format.DateUtils.FORMAT_NO_MONTH_DAY;

import static android.text.format.DateUtils.FORMAT_NO_YEAR;

import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_TIME;

import static android.text.format.DateUtils.FORMAT_SHOW_WEEKDAY;

import static android.text.format.DateUtils.FORMAT_SHOW_YEAR;



import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;



import android.icu.util.Calendar;
@@ -33,24 +47,6 @@ import com.android.internal.annotations.VisibleForTesting; 
 */

@VisibleForTesting(visibility = PACKAGE)

public final class DateUtilsBridge {

    // These are all public API in DateUtils. There are others, but they're either for use with

    // other methods (like FORMAT_ABBREV_RELATIVE), don't internationalize (like FORMAT_CAP_AMPM),

    // or have never been implemented anyway.

    public static final int FORMAT_SHOW_TIME = 0x00001;

    public static final int FORMAT_SHOW_WEEKDAY = 0x00002;

    public static final int FORMAT_SHOW_YEAR = 0x00004;

    public static final int FORMAT_NO_YEAR = 0x00008;

    public static final int FORMAT_SHOW_DATE = 0x00010;

    public static final int FORMAT_NO_MONTH_DAY = 0x00020;

    public static final int FORMAT_12HOUR = 0x00040;

    public static final int FORMAT_24HOUR = 0x00080;

    public static final int FORMAT_UTC = 0x02000;

    public static final int FORMAT_ABBREV_TIME = 0x04000;

    public static final int FORMAT_ABBREV_WEEKDAY = 0x08000;

    public static final int FORMAT_ABBREV_MONTH = 0x10000;

    public static final int FORMAT_NUMERIC_DATE = 0x20000;

    public static final int FORMAT_ABBREV_RELATIVE = 0x40000;

    public static final int FORMAT_ABBREV_ALL = 0x80000;



    /**

     * Creates an immutable ICU timezone backed by the specified libcore timezone data. At the time

core/java/android/text/format/RelativeDateTimeFormatter.java

+8 −8
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 


package android.text.format;



import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_RELATIVE;

import static android.text.format.DateUtilsBridge.FORMAT_NO_YEAR;

import static android.text.format.DateUtilsBridge.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_DATE;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_TIME;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_YEAR;

import static android.text.format.DateUtils.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtils.FORMAT_ABBREV_RELATIVE;

import static android.text.format.DateUtils.FORMAT_NO_YEAR;

import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_TIME;

import static android.text.format.DateUtils.FORMAT_SHOW_YEAR;



import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

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

+14 −14
Original line number Diff line number Diff line
@@ -19,20 +19,20 @@ package android.text.format; 
import static android.icu.util.TimeZone.GMT_ZONE;

import static android.icu.util.ULocale.ENGLISH;

import static android.text.format.DateIntervalFormat.formatDateRange;

import static android.text.format.DateUtilsBridge.FORMAT_12HOUR;

import static android.text.format.DateUtilsBridge.FORMAT_24HOUR;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_TIME;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_WEEKDAY;

import static android.text.format.DateUtilsBridge.FORMAT_NO_MONTH_DAY;

import static android.text.format.DateUtilsBridge.FORMAT_NO_YEAR;

import static android.text.format.DateUtilsBridge.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_DATE;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_TIME;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_WEEKDAY;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_YEAR;

import static android.text.format.DateUtilsBridge.FORMAT_UTC;

import static android.text.format.DateUtils.FORMAT_12HOUR;

import static android.text.format.DateUtils.FORMAT_24HOUR;

import static android.text.format.DateUtils.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtils.FORMAT_ABBREV_TIME;

import static android.text.format.DateUtils.FORMAT_ABBREV_WEEKDAY;

import static android.text.format.DateUtils.FORMAT_NO_MONTH_DAY;

import static android.text.format.DateUtils.FORMAT_NO_YEAR;

import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_TIME;

import static android.text.format.DateUtils.FORMAT_SHOW_WEEKDAY;

import static android.text.format.DateUtils.FORMAT_SHOW_YEAR;

import static android.text.format.DateUtils.FORMAT_UTC;



import static org.junit.Assert.assertEquals;

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

+5 −5
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package android.text.format;



import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_RELATIVE;

import static android.text.format.DateUtilsBridge.FORMAT_NO_YEAR;

import static android.text.format.DateUtilsBridge.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtilsBridge.FORMAT_SHOW_YEAR;

import static android.text.format.DateUtils.FORMAT_ABBREV_ALL;

import static android.text.format.DateUtils.FORMAT_ABBREV_RELATIVE;

import static android.text.format.DateUtils.FORMAT_NO_YEAR;

import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE;

import static android.text.format.DateUtils.FORMAT_SHOW_YEAR;

import static android.text.format.RelativeDateTimeFormatter.DAY_IN_MILLIS;

import static android.text.format.RelativeDateTimeFormatter.HOUR_IN_MILLIS;

import static android.text.format.RelativeDateTimeFormatter.MINUTE_IN_MILLIS;