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

Commit 902679c0 authored by vichang's avatar vichang Committed by android-build-merger
Browse files

Merge "API updated for ICU4J 60.1" am: 71b25c06 

am: 68f1995d

Change-Id: I572007ea58f4011d24004c90730b14e154cfae92
parents 9eb7d2e0 68f1995d

api/current.txt

+63 −0
Original line number Diff line number Diff line
@@ -16369,6 +16369,17 @@ package android.icu.lang { 
    field public static final int KNOTTED_HEH = 21; // 0x15

    field public static final int LAM = 22; // 0x16

    field public static final int LAMADH = 23; // 0x17

    field public static final int MALAYALAM_BHA = 89; // 0x59

    field public static final int MALAYALAM_JA = 90; // 0x5a

    field public static final int MALAYALAM_LLA = 91; // 0x5b

    field public static final int MALAYALAM_LLLA = 92; // 0x5c

    field public static final int MALAYALAM_NGA = 93; // 0x5d

    field public static final int MALAYALAM_NNA = 94; // 0x5e

    field public static final int MALAYALAM_NNNA = 95; // 0x5f

    field public static final int MALAYALAM_NYA = 96; // 0x60

    field public static final int MALAYALAM_RA = 97; // 0x61

    field public static final int MALAYALAM_SSA = 98; // 0x62

    field public static final int MALAYALAM_TTA = 99; // 0x63

    field public static final int MANICHAEAN_ALEPH = 58; // 0x3a

    field public static final int MANICHAEAN_AYIN = 59; // 0x3b

    field public static final int MANICHAEAN_BETH = 60; // 0x3c
@@ -16624,6 +16635,8 @@ package android.icu.lang { 
    field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D_ID = 209; // 0xd1

    field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E;

    field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E_ID = 256; // 0x100

    field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F;

    field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID = 274; // 0x112

    field public static final int CJK_UNIFIED_IDEOGRAPHS_ID = 71; // 0x47

    field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS;

    field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_EXTENDED;
@@ -16769,6 +16782,8 @@ package android.icu.lang { 
    field public static final int JAVANESE_ID = 181; // 0xb5

    field public static final android.icu.lang.UCharacter.UnicodeBlock KAITHI;

    field public static final int KAITHI_ID = 193; // 0xc1

    field public static final android.icu.lang.UCharacter.UnicodeBlock KANA_EXTENDED_A;

    field public static final int KANA_EXTENDED_A_ID = 275; // 0x113

    field public static final android.icu.lang.UCharacter.UnicodeBlock KANA_SUPPLEMENT;

    field public static final int KANA_SUPPLEMENT_ID = 203; // 0xcb

    field public static final android.icu.lang.UCharacter.UnicodeBlock KANBUN;
@@ -16841,6 +16856,8 @@ package android.icu.lang { 
    field public static final int MANICHAEAN_ID = 234; // 0xea

    field public static final android.icu.lang.UCharacter.UnicodeBlock MARCHEN;

    field public static final int MARCHEN_ID = 268; // 0x10c

    field public static final android.icu.lang.UCharacter.UnicodeBlock MASARAM_GONDI;

    field public static final int MASARAM_GONDI_ID = 276; // 0x114

    field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS;

    field public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93; // 0x5d

    field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_OPERATORS;
@@ -16900,6 +16917,8 @@ package android.icu.lang { 
    field public static final android.icu.lang.UCharacter.UnicodeBlock NO_BLOCK;

    field public static final android.icu.lang.UCharacter.UnicodeBlock NUMBER_FORMS;

    field public static final int NUMBER_FORMS_ID = 45; // 0x2d

    field public static final android.icu.lang.UCharacter.UnicodeBlock NUSHU;

    field public static final int NUSHU_ID = 277; // 0x115

    field public static final android.icu.lang.UCharacter.UnicodeBlock OGHAM;

    field public static final int OGHAM_ID = 34; // 0x22

    field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_HUNGARIAN;
@@ -16978,6 +16997,8 @@ package android.icu.lang { 
    field public static final int SMALL_FORM_VARIANTS_ID = 84; // 0x54

    field public static final android.icu.lang.UCharacter.UnicodeBlock SORA_SOMPENG;

    field public static final int SORA_SOMPENG_ID = 218; // 0xda

    field public static final android.icu.lang.UCharacter.UnicodeBlock SOYOMBO;

    field public static final int SOYOMBO_ID = 278; // 0x116

    field public static final android.icu.lang.UCharacter.UnicodeBlock SPACING_MODIFIER_LETTERS;

    field public static final int SPACING_MODIFIER_LETTERS_ID = 6; // 0x6

    field public static final android.icu.lang.UCharacter.UnicodeBlock SPECIALS;
@@ -17010,6 +17031,8 @@ package android.icu.lang { 
    field public static final int SYLOTI_NAGRI_ID = 143; // 0x8f

    field public static final android.icu.lang.UCharacter.UnicodeBlock SYRIAC;

    field public static final int SYRIAC_ID = 13; // 0xd

    field public static final android.icu.lang.UCharacter.UnicodeBlock SYRIAC_SUPPLEMENT;

    field public static final int SYRIAC_SUPPLEMENT_ID = 279; // 0x117

    field public static final android.icu.lang.UCharacter.UnicodeBlock TAGALOG;

    field public static final int TAGALOG_ID = 98; // 0x62

    field public static final android.icu.lang.UCharacter.UnicodeBlock TAGBANWA;
@@ -17070,6 +17093,8 @@ package android.icu.lang { 
    field public static final int YI_RADICALS_ID = 73; // 0x49

    field public static final android.icu.lang.UCharacter.UnicodeBlock YI_SYLLABLES;

    field public static final int YI_SYLLABLES_ID = 72; // 0x48

    field public static final android.icu.lang.UCharacter.UnicodeBlock ZANABAZAR_SQUARE;

    field public static final int ZANABAZAR_SQUARE_ID = 280; // 0x118

  }















  public static abstract interface UCharacter.WordBreak {










@@ -17220,6 +17245,11 @@ package android.icu.lang {













    field public static final int DIACRITIC = 7; // 0x7















    field public static final int DOUBLE_START = 12288; // 0x3000















    field public static final int EAST_ASIAN_WIDTH = 4100; // 0x1004













    field public static final int EMOJI = 57; // 0x39













    field public static final int EMOJI_COMPONENT = 61; // 0x3d













    field public static final int EMOJI_MODIFIER = 59; // 0x3b













    field public static final int EMOJI_MODIFIER_BASE = 60; // 0x3c













    field public static final int EMOJI_PRESENTATION = 58; // 0x3a















    field public static final int EXTENDER = 8; // 0x8















    field public static final int FULL_COMPOSITION_EXCLUSION = 9; // 0x9















    field public static final int GENERAL_CATEGORY = 4101; // 0x1005










@@ -17267,8 +17297,10 @@ package android.icu.lang {













    field public static final int POSIX_GRAPH = 46; // 0x2e















    field public static final int POSIX_PRINT = 47; // 0x2f















    field public static final int POSIX_XDIGIT = 48; // 0x30













    field public static final int PREPENDED_CONCATENATION_MARK = 63; // 0x3f















    field public static final int QUOTATION_MARK = 25; // 0x19















    field public static final int RADICAL = 26; // 0x1a













    field public static final int REGIONAL_INDICATOR = 62; // 0x3e















    field public static final int SCRIPT = 4106; // 0x100a















    field public static final int SCRIPT_EXTENSIONS = 28672; // 0x7000















    field public static final int SEGMENT_STARTER = 41; // 0x29










@@ -17410,6 +17442,7 @@ package android.icu.lang {













    field public static final int MANDAIC = 84; // 0x54















    field public static final int MANICHAEAN = 121; // 0x79















    field public static final int MARCHEN = 169; // 0xa9













    field public static final int MASARAM_GONDI = 175; // 0xaf















    field public static final int MATHEMATICAL_NOTATION = 128; // 0x80















    field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55















    field public static final int MEITEI_MAYEK = 115; // 0x73










@@ -17464,6 +17497,7 @@ package android.icu.lang {













    field public static final int SINDHI = 145; // 0x91















    field public static final int SINHALA = 33; // 0x21















    field public static final int SORA_SOMPENG = 152; // 0x98













    field public static final int SOYOMBO = 176; // 0xb0















    field public static final int SUNDANESE = 113; // 0x71















    field public static final int SYLOTI_NAGRI = 58; // 0x3a















    field public static final int SYMBOLS = 129; // 0x81










@@ -17494,6 +17528,7 @@ package android.icu.lang {













    field public static final int WESTERN_SYRIAC = 96; // 0x60















    field public static final int WOLEAI = 155; // 0x9b















    field public static final int YI = 41; // 0x29













    field public static final int ZANABAZAR_SQUARE = 177; // 0xb1















  }





























  public static final class UScript.ScriptUsage extends java.lang.Enum {










@@ -18288,11 +18323,14 @@ package android.icu.text {













    method public android.icu.util.Currency getCurrency();















    method public java.lang.String getCurrencySymbol();















    method public char getDecimalSeparator();













    method public java.lang.String getDecimalSeparatorString();















    method public char getDigit();













    method public java.lang.String[] getDigitStrings();















    method public char[] getDigits();















    method public java.lang.String getExponentMultiplicationSign();















    method public java.lang.String getExponentSeparator();















    method public char getGroupingSeparator();













    method public java.lang.String getGroupingSeparatorString();















    method public java.lang.String getInfinity();















    method public static android.icu.text.DecimalFormatSymbols getInstance();















    method public static android.icu.text.DecimalFormatSymbols getInstance(java.util.Locale);









@@ -18300,37 +18338,52 @@ package android.icu.text {













    method public java.lang.String getInternationalCurrencySymbol();















    method public java.util.Locale getLocale();















    method public char getMinusSign();













    method public java.lang.String getMinusSignString();















    method public char getMonetaryDecimalSeparator();













    method public java.lang.String getMonetaryDecimalSeparatorString();















    method public char getMonetaryGroupingSeparator();













    method public java.lang.String getMonetaryGroupingSeparatorString();















    method public java.lang.String getNaN();















    method public char getPadEscape();















    method public java.lang.String getPatternForCurrencySpacing(int, boolean);















    method public char getPatternSeparator();















    method public char getPerMill();













    method public java.lang.String getPerMillString();















    method public char getPercent();













    method public java.lang.String getPercentString();















    method public char getPlusSign();













    method public java.lang.String getPlusSignString();















    method public char getSignificantDigit();















    method public android.icu.util.ULocale getULocale();















    method public char getZeroDigit();















    method public void setCurrency(android.icu.util.Currency);















    method public void setCurrencySymbol(java.lang.String);















    method public void setDecimalSeparator(char);













    method public void setDecimalSeparatorString(java.lang.String);















    method public void setDigit(char);













    method public void setDigitStrings(java.lang.String[]);















    method public void setExponentMultiplicationSign(java.lang.String);















    method public void setExponentSeparator(java.lang.String);















    method public void setGroupingSeparator(char);













    method public void setGroupingSeparatorString(java.lang.String);















    method public void setInfinity(java.lang.String);















    method public void setInternationalCurrencySymbol(java.lang.String);















    method public void setMinusSign(char);













    method public void setMinusSignString(java.lang.String);















    method public void setMonetaryDecimalSeparator(char);













    method public void setMonetaryDecimalSeparatorString(java.lang.String);















    method public void setMonetaryGroupingSeparator(char);













    method public void setMonetaryGroupingSeparatorString(java.lang.String);















    method public void setNaN(java.lang.String);















    method public void setPadEscape(char);















    method public void setPatternForCurrencySpacing(int, boolean, java.lang.String);















    method public void setPatternSeparator(char);















    method public void setPerMill(char);













    method public void setPerMillString(java.lang.String);















    method public void setPercent(char);













    method public void setPercentString(java.lang.String);















    method public void setPlusSign(char);













    method public void setPlusSignString(java.lang.String);















    method public void setSignificantDigit(char);















    method public void setZeroDigit(char);















    field public static final int CURRENCY_SPC_CURRENCY_MATCH = 0; // 0x0









@@ -18351,7 +18404,9 @@ package android.icu.text {













    enum_constant public static final android.icu.text.DisplayContext DIALECT_NAMES;















    enum_constant public static final android.icu.text.DisplayContext LENGTH_FULL;















    enum_constant public static final android.icu.text.DisplayContext LENGTH_SHORT;













    enum_constant public static final android.icu.text.DisplayContext NO_SUBSTITUTE;















    enum_constant public static final android.icu.text.DisplayContext STANDARD_NAMES;













    enum_constant public static final android.icu.text.DisplayContext SUBSTITUTE;















  }





























  public static final class DisplayContext.Type extends java.lang.Enum {









@@ -18360,6 +18415,7 @@ package android.icu.text {













    enum_constant public static final android.icu.text.DisplayContext.Type CAPITALIZATION;















    enum_constant public static final android.icu.text.DisplayContext.Type DIALECT_HANDLING;















    enum_constant public static final android.icu.text.DisplayContext.Type DISPLAY_LENGTH;













    enum_constant public static final android.icu.text.DisplayContext.Type SUBSTITUTE_HANDLING;















  }





























  public abstract class IDNA {










@@ -18467,6 +18523,7 @@ package android.icu.text {













    method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);















    method public final android.icu.util.ULocale getLocale();















    method public android.icu.text.NumberFormat getNumberFormat();













    method public java.lang.String getUnitDisplayName(android.icu.util.MeasureUnit);















    method public android.icu.text.MeasureFormat.FormatWidth getWidth();















    method public final int hashCode();















    method public android.icu.util.Measure parseObject(java.lang.String, java.text.ParsePosition);










@@ -20005,6 +20062,7 @@ package android.icu.util {













    field public static final android.icu.util.MeasureUnit MILLILITER;















    field public static final android.icu.util.MeasureUnit MILLIMETER;















    field public static final android.icu.util.MeasureUnit MILLIMETER_OF_MERCURY;













    field public static final android.icu.util.MeasureUnit MILLIMOLE_PER_LITER;















    field public static final android.icu.util.MeasureUnit MILLISECOND;















    field public static final android.icu.util.MeasureUnit MILLIWATT;















    field public static final android.icu.util.TimeUnit MINUTE;









@@ -20016,6 +20074,7 @@ package android.icu.util {













    field public static final android.icu.util.MeasureUnit OUNCE;















    field public static final android.icu.util.MeasureUnit OUNCE_TROY;















    field public static final android.icu.util.MeasureUnit PARSEC;













    field public static final android.icu.util.MeasureUnit PART_PER_MILLION;















    field public static final android.icu.util.MeasureUnit PICOMETER;















    field public static final android.icu.util.MeasureUnit PINT;















    field public static final android.icu.util.MeasureUnit PINT_METRIC;










@@ -20139,6 +20198,9 @@ package android.icu.util {













  public static final class TimeZone.SystemTimeZoneType extends java.lang.Enum {















    method public static android.icu.util.TimeZone.SystemTimeZoneType valueOf(java.lang.String);















    method public static final android.icu.util.TimeZone.SystemTimeZoneType[] values();













    enum_constant public static final android.icu.util.TimeZone.SystemTimeZoneType ANY;













    enum_constant public static final android.icu.util.TimeZone.SystemTimeZoneType CANONICAL;













    enum_constant public static final android.icu.util.TimeZone.SystemTimeZoneType CANONICAL_LOCATION;















  }





























  public final class ULocale implements java.lang.Comparable java.io.Serializable {










@@ -20340,6 +20402,7 @@ package android.icu.util {













    field public static final android.icu.util.VersionInfo ICU_VERSION;















    field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION;















    field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION;













    field public static final android.icu.util.VersionInfo UNICODE_10_0;















    field public static final android.icu.util.VersionInfo UNICODE_1_0;















    field public static final android.icu.util.VersionInfo UNICODE_1_0_1;















    field public static final android.icu.util.VersionInfo UNICODE_1_1_0;