Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c

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

Change-Id: Ibfa1c1e12f3f2c924f08ec2fa357d31cc0e8ecb7
This commit is contained in:
vichang
2020-07-21 09:22:44 +00:00
committed by Automerger Merge Worker
parent 85c56c1fa4 3db0441e5c
commit c52a84acf3
5 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/text/format/DateIntervalFormat.java
View File

@@ -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)

32
core/java/android/text/format/DateUtilsBridge.java
View File

@@ -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

16
core/java/android/text/format/RelativeDateTimeFormatter.java
View File

@@ -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;

28
core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java
View File

@@ -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;

10
core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java
View File

@@ -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;