diff options
5 files changed, 44 insertions, 48 deletions
diff --git a/core/java/android/text/format/DateIntervalFormat.java b/core/java/android/text/format/DateIntervalFormat.java index 427016d32ac2..de9ec7ab9ea9 100644 --- a/core/java/android/text/format/DateIntervalFormat.java +++ b/core/java/android/text/format/DateIntervalFormat.java @@ -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) diff --git a/core/java/android/text/format/DateUtilsBridge.java b/core/java/android/text/format/DateUtilsBridge.java index 370d999abf3e..92ec9cf6d736 100644 --- a/core/java/android/text/format/DateUtilsBridge.java +++ b/core/java/android/text/format/DateUtilsBridge.java @@ -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 diff --git a/core/java/android/text/format/RelativeDateTimeFormatter.java b/core/java/android/text/format/RelativeDateTimeFormatter.java index c5bca172873a..9096469699c1 100644 --- a/core/java/android/text/format/RelativeDateTimeFormatter.java +++ b/core/java/android/text/format/RelativeDateTimeFormatter.java @@ -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; diff --git a/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java b/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java index 7c0949973fe6..0f17d27048f3 100644 --- a/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java +++ b/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java @@ -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; diff --git a/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java b/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java index d9ba8fb81d3c..4b3b5735b4f3 100644 --- a/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java +++ b/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java @@ -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; |