diff options
| author | 2017-01-24 12:35:30 +0000 | |
|---|---|---|
| committer | 2017-01-24 12:35:30 +0000 | |
| commit | 52722312598636ca41bdf6cda593f5d018cfc970 (patch) | |
| tree | 5de50861aea7151452bc714445e566145373a63b | |
| parent | 555812a3e2ec4c92dc3835797eb3e524b67709cb (diff) | |
| parent | e5f0221f06816aab958eb1fa6630e58ebfaf3d74 (diff) | |
Merge "Expose more ICU4J APIs."
am: e5f0221f06
Change-Id: I77e300979bdfe781ad9ab7aff5241b92491e5660
| -rw-r--r-- | api/current.txt | 86 | ||||
| -rw-r--r-- | api/system-current.txt | 86 | ||||
| -rw-r--r-- | api/test-current.txt | 86 |
3 files changed, 258 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 241a0849379a..ba2ab8a63fcc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17013,6 +17013,15 @@ package android.icu.text { method public boolean isTransitionalDifferent(); } + public final class ListFormatter { + method public java.lang.String format(java.lang.Object...); + method public java.lang.String format(java.util.Collection<?>); + method public static android.icu.text.ListFormatter getInstance(android.icu.util.ULocale); + method public static android.icu.text.ListFormatter getInstance(java.util.Locale); + method public static android.icu.text.ListFormatter getInstance(); + method public java.lang.String getPatternForNumItems(int); + } + public abstract class LocaleDisplayNames { method public abstract android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type); method public abstract android.icu.text.LocaleDisplayNames.DialectHandling getDialectHandling(); @@ -17022,6 +17031,8 @@ package android.icu.text { method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.DisplayContext...); method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale, android.icu.text.DisplayContext...); method public abstract android.icu.util.ULocale getLocale(); + method public java.util.List<android.icu.text.LocaleDisplayNames.UiListItem> getUiList(java.util.Set<android.icu.util.ULocale>, boolean, java.util.Comparator<java.lang.Object>); + method public abstract java.util.List<android.icu.text.LocaleDisplayNames.UiListItem> getUiListCompareWholeItems(java.util.Set<android.icu.util.ULocale>, java.util.Comparator<android.icu.text.LocaleDisplayNames.UiListItem>); method public abstract java.lang.String keyDisplayName(java.lang.String); method public abstract java.lang.String keyValueDisplayName(java.lang.String, java.lang.String); method public abstract java.lang.String languageDisplayName(java.lang.String); @@ -17041,9 +17052,19 @@ package android.icu.text { enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling STANDARD_NAMES; } + public static class LocaleDisplayNames.UiListItem { + ctor public LocaleDisplayNames.UiListItem(android.icu.util.ULocale, android.icu.util.ULocale, java.lang.String, java.lang.String); + method public static java.util.Comparator<android.icu.text.LocaleDisplayNames.UiListItem> getComparator(java.util.Comparator<java.lang.Object>, boolean); + field public final android.icu.util.ULocale minimized; + field public final android.icu.util.ULocale modified; + field public final java.lang.String nameInDisplayLocale; + field public final java.lang.String nameInSelf; + } + public class MeasureFormat extends android.icu.text.UFormat { method public final boolean equals(java.lang.Object); method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition); + method public java.lang.StringBuilder formatMeasurePerUnit(android.icu.util.Measure, android.icu.util.MeasureUnit, java.lang.StringBuilder, java.text.FieldPosition); method public final java.lang.String formatMeasures(android.icu.util.Measure...); method public java.lang.StringBuilder formatMeasures(java.lang.StringBuilder, java.text.FieldPosition, android.icu.util.Measure...); method public static android.icu.text.MeasureFormat getCurrencyFormat(android.icu.util.ULocale); @@ -17512,6 +17533,14 @@ package android.icu.text { method public void setUpperCaseFirst(boolean); } + public final class ScientificNumberFormatter { + method public java.lang.String format(java.lang.Object); + method public static android.icu.text.ScientificNumberFormatter getMarkupInstance(android.icu.util.ULocale, java.lang.String, java.lang.String); + method public static android.icu.text.ScientificNumberFormatter getMarkupInstance(android.icu.text.DecimalFormat, java.lang.String, java.lang.String); + method public static android.icu.text.ScientificNumberFormatter getSuperscriptInstance(android.icu.util.ULocale); + method public static android.icu.text.ScientificNumberFormatter getSuperscriptInstance(android.icu.text.DecimalFormat); + } + public abstract class SearchIterator { ctor protected SearchIterator(java.text.CharacterIterator, android.icu.text.BreakIterator); method public final int first(); @@ -18287,6 +18316,34 @@ package android.icu.util { method public long getToDate(); } + public final class EthiopicCalendar extends android.icu.util.CECalendar { + ctor public EthiopicCalendar(); + ctor public EthiopicCalendar(android.icu.util.TimeZone); + ctor public EthiopicCalendar(java.util.Locale); + ctor public EthiopicCalendar(android.icu.util.ULocale); + ctor public EthiopicCalendar(android.icu.util.TimeZone, java.util.Locale); + ctor public EthiopicCalendar(android.icu.util.TimeZone, android.icu.util.ULocale); + ctor public EthiopicCalendar(int, int, int); + ctor public EthiopicCalendar(java.util.Date); + ctor public EthiopicCalendar(int, int, int, int, int, int); + method protected deprecated int handleGetExtendedYear(); + method public boolean isAmeteAlemEra(); + method public void setAmeteAlemEra(boolean); + field public static final int GENBOT = 8; // 0x8 + field public static final int HAMLE = 10; // 0xa + field public static final int HEDAR = 2; // 0x2 + field public static final int MEGABIT = 6; // 0x6 + field public static final int MESKEREM = 0; // 0x0 + field public static final int MIAZIA = 7; // 0x7 + field public static final int NEHASSE = 11; // 0xb + field public static final int PAGUMEN = 12; // 0xc + field public static final int SENE = 9; // 0x9 + field public static final int TAHSAS = 3; // 0x3 + field public static final int TEKEMT = 1; // 0x1 + field public static final int TER = 4; // 0x4 + field public static final int YEKATIT = 5; // 0x5 + } + public abstract interface Freezable<T> implements java.lang.Cloneable { method public abstract T cloneAsThawed(); method public abstract T freeze(); @@ -18815,6 +18872,35 @@ package android.icu.util { enum_constant public static final android.icu.util.ULocale.Category FORMAT; } + public final class UniversalTimeScale { + method public static android.icu.math.BigDecimal bigDecimalFrom(double, int); + method public static android.icu.math.BigDecimal bigDecimalFrom(long, int); + method public static android.icu.math.BigDecimal bigDecimalFrom(android.icu.math.BigDecimal, int); + method public static long from(long, int); + method public static long getTimeScaleValue(int, int); + method public static android.icu.math.BigDecimal toBigDecimal(long, int); + method public static android.icu.math.BigDecimal toBigDecimal(android.icu.math.BigDecimal, int); + method public static long toLong(long, int); + field public static final int DB2_TIME = 8; // 0x8 + field public static final int DOTNET_DATE_TIME = 4; // 0x4 + field public static final int EPOCH_OFFSET_PLUS_1_VALUE = 6; // 0x6 + field public static final int EPOCH_OFFSET_VALUE = 1; // 0x1 + field public static final int EXCEL_TIME = 7; // 0x7 + field public static final int FROM_MAX_VALUE = 3; // 0x3 + field public static final int FROM_MIN_VALUE = 2; // 0x2 + field public static final int ICU4C_TIME = 2; // 0x2 + field public static final int JAVA_TIME = 0; // 0x0 + field public static final int MAC_OLD_TIME = 5; // 0x5 + field public static final int MAC_TIME = 6; // 0x6 + field public static final int MAX_SCALE = 10; // 0xa + field public static final int TO_MAX_VALUE = 5; // 0x5 + field public static final int TO_MIN_VALUE = 4; // 0x4 + field public static final int UNITS_VALUE = 0; // 0x0 + field public static final int UNIX_MICROSECONDS_TIME = 9; // 0x9 + field public static final int UNIX_TIME = 1; // 0x1 + field public static final int WINDOWS_FILE_TIME = 3; // 0x3 + } + public abstract interface ValueIterator { method public abstract boolean next(android.icu.util.ValueIterator.Element); method public abstract void reset(); diff --git a/api/system-current.txt b/api/system-current.txt index 187299daf9d7..f8b75a2a82cf 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18226,6 +18226,15 @@ package android.icu.text { method public boolean isTransitionalDifferent(); } + public final class ListFormatter { + method public java.lang.String format(java.lang.Object...); + method public java.lang.String format(java.util.Collection<?>); + method public static android.icu.text.ListFormatter getInstance(android.icu.util.ULocale); + method public static android.icu.text.ListFormatter getInstance(java.util.Locale); + method public static android.icu.text.ListFormatter getInstance(); + method public java.lang.String getPatternForNumItems(int); + } + public abstract class LocaleDisplayNames { method public abstract android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type); method public abstract android.icu.text.LocaleDisplayNames.DialectHandling getDialectHandling(); @@ -18235,6 +18244,8 @@ package android.icu.text { method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.DisplayContext...); method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale, android.icu.text.DisplayContext...); method public abstract android.icu.util.ULocale getLocale(); + method public java.util.List<android.icu.text.LocaleDisplayNames.UiListItem> getUiList(java.util.Set<android.icu.util.ULocale>, boolean, java.util.Comparator<java.lang.Object>); + method public abstract java.util.List<android.icu.text.LocaleDisplayNames.UiListItem> getUiListCompareWholeItems(java.util.Set<android.icu.util.ULocale>, java.util.Comparator<android.icu.text.LocaleDisplayNames.UiListItem>); method public abstract java.lang.String keyDisplayName(java.lang.String); method public abstract java.lang.String keyValueDisplayName(java.lang.String, java.lang.String); method public abstract java.lang.String languageDisplayName(java.lang.String); @@ -18254,9 +18265,19 @@ package android.icu.text { enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling STANDARD_NAMES; } + public static class LocaleDisplayNames.UiListItem { + ctor public LocaleDisplayNames.UiListItem(android.icu.util.ULocale, android.icu.util.ULocale, java.lang.String, java.lang.String); + method public static java.util.Comparator<android.icu.text.LocaleDisplayNames.UiListItem> getComparator(java.util.Comparator<java.lang.Object>, boolean); + field public final android.icu.util.ULocale minimized; + field public final android.icu.util.ULocale modified; + field public final java.lang.String nameInDisplayLocale; + field public final java.lang.String nameInSelf; + } + public class MeasureFormat extends android.icu.text.UFormat { method public final boolean equals(java.lang.Object); method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition); + method public java.lang.StringBuilder formatMeasurePerUnit(android.icu.util.Measure, android.icu.util.MeasureUnit, java.lang.StringBuilder, java.text.FieldPosition); method public final java.lang.String formatMeasures(android.icu.util.Measure...); method public java.lang.StringBuilder formatMeasures(java.lang.StringBuilder, java.text.FieldPosition, android.icu.util.Measure...); method public static android.icu.text.MeasureFormat getCurrencyFormat(android.icu.util.ULocale); @@ -18725,6 +18746,14 @@ package android.icu.text { method public void setUpperCaseFirst(boolean); } + public final class ScientificNumberFormatter { + method public java.lang.String format(java.lang.Object); + method public static android.icu.text.ScientificNumberFormatter getMarkupInstance(android.icu.util.ULocale, java.lang.String, java.lang.String); + method public static android.icu.text.ScientificNumberFormatter getMarkupInstance(android.icu.text.DecimalFormat, java.lang.String, java.lang.String); + method public static android.icu.text.ScientificNumberFormatter getSuperscriptInstance(android.icu.util.ULocale); + method public static android.icu.text.ScientificNumberFormatter getSuperscriptInstance(android.icu.text.DecimalFormat); + } + public abstract class SearchIterator { ctor protected SearchIterator(java.text.CharacterIterator, android.icu.text.BreakIterator); method public final int first(); @@ -19500,6 +19529,34 @@ package android.icu.util { method public long getToDate(); } + public final class EthiopicCalendar extends android.icu.util.CECalendar { + ctor public EthiopicCalendar(); + ctor public EthiopicCalendar(android.icu.util.TimeZone); + ctor public EthiopicCalendar(java.util.Locale); + ctor public EthiopicCalendar(android.icu.util.ULocale); + ctor public EthiopicCalendar(android.icu.util.TimeZone, java.util.Locale); + ctor public EthiopicCalendar(android.icu.util.TimeZone, android.icu.util.ULocale); + ctor public EthiopicCalendar(int, int, int); + ctor public EthiopicCalendar(java.util.Date); + ctor public EthiopicCalendar(int, int, int, int, int, int); + method protected deprecated int handleGetExtendedYear(); + method public boolean isAmeteAlemEra(); + method public void setAmeteAlemEra(boolean); + field public static final int GENBOT = 8; // 0x8 + field public static final int HAMLE = 10; // 0xa + field public static final int HEDAR = 2; // 0x2 + field public static final int MEGABIT = 6; // 0x6 + field public static final int MESKEREM = 0; // 0x0 + field public static final int MIAZIA = 7; // 0x7 + field public static final int NEHASSE = 11; // 0xb + field public static final int PAGUMEN = 12; // 0xc + field public static final int SENE = 9; // 0x9 + field public static final int TAHSAS = 3; // 0x3 + field public static final int TEKEMT = 1; // 0x1 + field public static final int TER = 4; // 0x4 + field public static final int YEKATIT = 5; // 0x5 + } + public abstract interface Freezable<T> implements java.lang.Cloneable { method public abstract T cloneAsThawed(); method public abstract T freeze(); @@ -20028,6 +20085,35 @@ package android.icu.util { enum_constant public static final android.icu.util.ULocale.Category FORMAT; } + public final class UniversalTimeScale { + method public static android.icu.math.BigDecimal bigDecimalFrom(double, int); + method public static android.icu.math.BigDecimal bigDecimalFrom(long, int); + method public static android.icu.math.BigDecimal bigDecimalFrom(android.icu.math.BigDecimal, int); + method public static long from(long, int); + method public static long getTimeScaleValue(int, int); + method public static android.icu.math.BigDecimal toBigDecimal(long, int); + method public static android.icu.math.BigDecimal toBigDecimal(android.icu.math.BigDecimal, int); + method public static long toLong(long, int); + field public static final int DB2_TIME = 8; // 0x8 + field public static final int DOTNET_DATE_TIME = 4; // 0x4 + field public static final int EPOCH_OFFSET_PLUS_1_VALUE = 6; // 0x6 + field public static final int EPOCH_OFFSET_VALUE = 1; // 0x1 + field public static final int EXCEL_TIME = 7; // 0x7 + field public static final int FROM_MAX_VALUE = 3; // 0x3 + field public static final int FROM_MIN_VALUE = 2; // 0x2 + field public static final int ICU4C_TIME = 2; // 0x2 + field public static final int JAVA_TIME = 0; // 0x0 + field public static final int MAC_OLD_TIME = 5; // 0x5 + field public static final int MAC_TIME = 6; // 0x6 + field public static final int MAX_SCALE = 10; // 0xa + field public static final int TO_MAX_VALUE = 5; // 0x5 + field public static final int TO_MIN_VALUE = 4; // 0x4 + field public static final int UNITS_VALUE = 0; // 0x0 + field public static final int UNIX_MICROSECONDS_TIME = 9; // 0x9 + field public static final int UNIX_TIME = 1; // 0x1 + field public static final int WINDOWS_FILE_TIME = 3; // 0x3 + } + public abstract interface ValueIterator { method public abstract boolean next(android.icu.util.ValueIterator.Element); method public abstract void reset(); diff --git a/api/test-current.txt b/api/test-current.txt index 016645d37f85..4f0d95136111 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -17030,6 +17030,15 @@ package android.icu.text { method public boolean isTransitionalDifferent(); } + public final class ListFormatter { + method public java.lang.String format(java.lang.Object...); + method public java.lang.String format(java.util.Collection<?>); + method public static android.icu.text.ListFormatter getInstance(android.icu.util.ULocale); + method public static android.icu.text.ListFormatter getInstance(java.util.Locale); + method public static android.icu.text.ListFormatter getInstance(); + method public java.lang.String getPatternForNumItems(int); + } + public abstract class LocaleDisplayNames { method public abstract android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type); method public abstract android.icu.text.LocaleDisplayNames.DialectHandling getDialectHandling(); @@ -17039,6 +17048,8 @@ package android.icu.text { method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.DisplayContext...); method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale, android.icu.text.DisplayContext...); method public abstract android.icu.util.ULocale getLocale(); + method public java.util.List<android.icu.text.LocaleDisplayNames.UiListItem> getUiList(java.util.Set<android.icu.util.ULocale>, boolean, java.util.Comparator<java.lang.Object>); + method public abstract java.util.List<android.icu.text.LocaleDisplayNames.UiListItem> getUiListCompareWholeItems(java.util.Set<android.icu.util.ULocale>, java.util.Comparator<android.icu.text.LocaleDisplayNames.UiListItem>); method public abstract java.lang.String keyDisplayName(java.lang.String); method public abstract java.lang.String keyValueDisplayName(java.lang.String, java.lang.String); method public abstract java.lang.String languageDisplayName(java.lang.String); @@ -17058,9 +17069,19 @@ package android.icu.text { enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling STANDARD_NAMES; } + public static class LocaleDisplayNames.UiListItem { + ctor public LocaleDisplayNames.UiListItem(android.icu.util.ULocale, android.icu.util.ULocale, java.lang.String, java.lang.String); + method public static java.util.Comparator<android.icu.text.LocaleDisplayNames.UiListItem> getComparator(java.util.Comparator<java.lang.Object>, boolean); + field public final android.icu.util.ULocale minimized; + field public final android.icu.util.ULocale modified; + field public final java.lang.String nameInDisplayLocale; + field public final java.lang.String nameInSelf; + } + public class MeasureFormat extends android.icu.text.UFormat { method public final boolean equals(java.lang.Object); method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition); + method public java.lang.StringBuilder formatMeasurePerUnit(android.icu.util.Measure, android.icu.util.MeasureUnit, java.lang.StringBuilder, java.text.FieldPosition); method public final java.lang.String formatMeasures(android.icu.util.Measure...); method public java.lang.StringBuilder formatMeasures(java.lang.StringBuilder, java.text.FieldPosition, android.icu.util.Measure...); method public static android.icu.text.MeasureFormat getCurrencyFormat(android.icu.util.ULocale); @@ -17529,6 +17550,14 @@ package android.icu.text { method public void setUpperCaseFirst(boolean); } + public final class ScientificNumberFormatter { + method public java.lang.String format(java.lang.Object); + method public static android.icu.text.ScientificNumberFormatter getMarkupInstance(android.icu.util.ULocale, java.lang.String, java.lang.String); + method public static android.icu.text.ScientificNumberFormatter getMarkupInstance(android.icu.text.DecimalFormat, java.lang.String, java.lang.String); + method public static android.icu.text.ScientificNumberFormatter getSuperscriptInstance(android.icu.util.ULocale); + method public static android.icu.text.ScientificNumberFormatter getSuperscriptInstance(android.icu.text.DecimalFormat); + } + public abstract class SearchIterator { ctor protected SearchIterator(java.text.CharacterIterator, android.icu.text.BreakIterator); method public final int first(); @@ -18304,6 +18333,34 @@ package android.icu.util { method public long getToDate(); } + public final class EthiopicCalendar extends android.icu.util.CECalendar { + ctor public EthiopicCalendar(); + ctor public EthiopicCalendar(android.icu.util.TimeZone); + ctor public EthiopicCalendar(java.util.Locale); + ctor public EthiopicCalendar(android.icu.util.ULocale); + ctor public EthiopicCalendar(android.icu.util.TimeZone, java.util.Locale); + ctor public EthiopicCalendar(android.icu.util.TimeZone, android.icu.util.ULocale); + ctor public EthiopicCalendar(int, int, int); + ctor public EthiopicCalendar(java.util.Date); + ctor public EthiopicCalendar(int, int, int, int, int, int); + method protected deprecated int handleGetExtendedYear(); + method public boolean isAmeteAlemEra(); + method public void setAmeteAlemEra(boolean); + field public static final int GENBOT = 8; // 0x8 + field public static final int HAMLE = 10; // 0xa + field public static final int HEDAR = 2; // 0x2 + field public static final int MEGABIT = 6; // 0x6 + field public static final int MESKEREM = 0; // 0x0 + field public static final int MIAZIA = 7; // 0x7 + field public static final int NEHASSE = 11; // 0xb + field public static final int PAGUMEN = 12; // 0xc + field public static final int SENE = 9; // 0x9 + field public static final int TAHSAS = 3; // 0x3 + field public static final int TEKEMT = 1; // 0x1 + field public static final int TER = 4; // 0x4 + field public static final int YEKATIT = 5; // 0x5 + } + public abstract interface Freezable<T> implements java.lang.Cloneable { method public abstract T cloneAsThawed(); method public abstract T freeze(); @@ -18832,6 +18889,35 @@ package android.icu.util { enum_constant public static final android.icu.util.ULocale.Category FORMAT; } + public final class UniversalTimeScale { + method public static android.icu.math.BigDecimal bigDecimalFrom(double, int); + method public static android.icu.math.BigDecimal bigDecimalFrom(long, int); + method public static android.icu.math.BigDecimal bigDecimalFrom(android.icu.math.BigDecimal, int); + method public static long from(long, int); + method public static long getTimeScaleValue(int, int); + method public static android.icu.math.BigDecimal toBigDecimal(long, int); + method public static android.icu.math.BigDecimal toBigDecimal(android.icu.math.BigDecimal, int); + method public static long toLong(long, int); + field public static final int DB2_TIME = 8; // 0x8 + field public static final int DOTNET_DATE_TIME = 4; // 0x4 + field public static final int EPOCH_OFFSET_PLUS_1_VALUE = 6; // 0x6 + field public static final int EPOCH_OFFSET_VALUE = 1; // 0x1 + field public static final int EXCEL_TIME = 7; // 0x7 + field public static final int FROM_MAX_VALUE = 3; // 0x3 + field public static final int FROM_MIN_VALUE = 2; // 0x2 + field public static final int ICU4C_TIME = 2; // 0x2 + field public static final int JAVA_TIME = 0; // 0x0 + field public static final int MAC_OLD_TIME = 5; // 0x5 + field public static final int MAC_TIME = 6; // 0x6 + field public static final int MAX_SCALE = 10; // 0xa + field public static final int TO_MAX_VALUE = 5; // 0x5 + field public static final int TO_MIN_VALUE = 4; // 0x4 + field public static final int UNITS_VALUE = 0; // 0x0 + field public static final int UNIX_MICROSECONDS_TIME = 9; // 0x9 + field public static final int UNIX_TIME = 1; // 0x1 + field public static final int WINDOWS_FILE_TIME = 3; // 0x3 + } + public abstract interface ValueIterator { method public abstract boolean next(android.icu.util.ValueIterator.Element); method public abstract void reset(); |