Merge "API updated for ICU4J 58.1"
diff --git a/api/current.txt b/api/current.txt
index 52d0517..89800d2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14950,6 +14950,10 @@
field public static final int CONTROL = 1; // 0x1
field public static final int CR = 2; // 0x2
field public static final int EXTEND = 3; // 0x3
+ field public static final int E_BASE = 13; // 0xd
+ field public static final int E_BASE_GAZ = 14; // 0xe
+ field public static final int E_MODIFIER = 15; // 0xf
+ field public static final int GLUE_AFTER_ZWJ = 16; // 0x10
field public static final int L = 4; // 0x4
field public static final int LF = 5; // 0x5
field public static final int LV = 6; // 0x6
@@ -14960,6 +14964,7 @@
field public static final int SPACING_MARK = 10; // 0xa
field public static final int T = 8; // 0x8
field public static final int V = 9; // 0x9
+ field public static final int ZWJ = 17; // 0x11
}
public static abstract interface UCharacter.HangulSyllableType {
@@ -14972,6 +14977,9 @@
}
public static abstract interface UCharacter.JoiningGroup {
+ field public static final int AFRICAN_FEH = 86; // 0x56
+ field public static final int AFRICAN_NOON = 87; // 0x57
+ field public static final int AFRICAN_QAF = 88; // 0x58
field public static final int AIN = 1; // 0x1
field public static final int ALAPH = 2; // 0x2
field public static final int ALEF = 3; // 0x3
@@ -15085,6 +15093,8 @@
field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
field public static final int CONTINGENT_BREAK = 7; // 0x7
field public static final int EXCLAMATION = 11; // 0xb
+ field public static final int E_BASE = 40; // 0x28
+ field public static final int E_MODIFIER = 41; // 0x29
field public static final int GLUE = 12; // 0xc
field public static final int H2 = 31; // 0x1f
field public static final int H3 = 32; // 0x20
@@ -15111,6 +15121,7 @@
field public static final int SURROGATE = 25; // 0x19
field public static final int UNKNOWN = 0; // 0x0
field public static final int WORD_JOINER = 30; // 0x1e
+ field public static final int ZWJ = 42; // 0x2a
field public static final int ZWSPACE = 28; // 0x1c
}
@@ -15144,6 +15155,8 @@
method public int getID();
method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ADLAM;
+ field public static final int ADLAM_ID = 263; // 0x107
field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
@@ -15192,6 +15205,8 @@
field public static final int BATAK_ID = 199; // 0xc7
field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
field public static final int BENGALI_ID = 16; // 0x10
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BHAIKSUKI;
+ field public static final int BHAIKSUKI_ID = 264; // 0x108
field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
@@ -15281,6 +15296,8 @@
field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_C;
+ field public static final int CYRILLIC_EXTENDED_C_ID = 265; // 0x109
field public static final int CYRILLIC_ID = 9; // 0x9
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
@@ -15334,6 +15351,8 @@
field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
field public static final int GLAGOLITIC_ID = 136; // 0x88
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC_SUPPLEMENT;
+ field public static final int GLAGOLITIC_SUPPLEMENT_ID = 266; // 0x10a
field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
field public static final int GOTHIC_ID = 89; // 0x59
field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
@@ -15372,6 +15391,8 @@
field public static final int HIRAGANA_ID = 62; // 0x3e
field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION;
+ field public static final int IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION_ID = 267; // 0x10b
field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
@@ -15456,6 +15477,8 @@
field public static final int MANDAIC_ID = 198; // 0xc6
field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
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 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;
@@ -15490,6 +15513,8 @@
field public static final int MODI_ID = 236; // 0xec
field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
field public static final int MONGOLIAN_ID = 37; // 0x25
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN_SUPPLEMENT;
+ field public static final int MONGOLIAN_SUPPLEMENT_ID = 269; // 0x10d
field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
field public static final int MRO_ID = 237; // 0xed
field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
@@ -15504,6 +15529,8 @@
field public static final int MYANMAR_ID = 28; // 0x1c
field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
field public static final int NABATAEAN_ID = 239; // 0xef
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NEWA;
+ field public static final int NEWA_ID = 270; // 0x10e
field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
@@ -15535,6 +15562,8 @@
field public static final int ORIYA_ID = 19; // 0x13
field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OSAGE;
+ field public static final int OSAGE_ID = 271; // 0x10f
field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
field public static final int OSMANYA_ID = 122; // 0x7a
field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
@@ -15637,6 +15666,10 @@
field public static final int TAKRI_ID = 220; // 0xdc
field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
field public static final int TAMIL_ID = 20; // 0x14
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT_COMPONENTS;
+ field public static final int TANGUT_COMPONENTS_ID = 273; // 0x111
+ field public static final int TANGUT_ID = 272; // 0x110
field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
field public static final int TELUGU_ID = 21; // 0x15
field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
@@ -15683,7 +15716,11 @@
field public static final int DOUBLE_QUOTE = 16; // 0x10
field public static final int EXTEND = 9; // 0x9
field public static final int EXTENDNUMLET = 7; // 0x7
+ field public static final int E_BASE = 17; // 0x11
+ field public static final int E_BASE_GAZ = 18; // 0x12
+ field public static final int E_MODIFIER = 19; // 0x13
field public static final int FORMAT = 2; // 0x2
+ field public static final int GLUE_AFTER_ZWJ = 20; // 0x14
field public static final int HEBREW_LETTER = 14; // 0xe
field public static final int KATAKANA = 3; // 0x3
field public static final int LF = 10; // 0xa
@@ -15695,6 +15732,7 @@
field public static final int OTHER = 0; // 0x0
field public static final int REGIONAL_INDICATOR = 13; // 0xd
field public static final int SINGLE_QUOTE = 15; // 0xf
+ field public static final int ZWJ = 21; // 0x15
}
public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
@@ -15913,6 +15951,7 @@
method public static final boolean hasScript(int, int);
method public static final boolean isCased(int);
method public static final boolean isRightToLeft(int);
+ field public static final int ADLAM = 167; // 0xa7
field public static final int AFAKA = 147; // 0x93
field public static final int AHOM = 161; // 0xa1
field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
@@ -15924,6 +15963,7 @@
field public static final int BASSA_VAH = 134; // 0x86
field public static final int BATAK = 63; // 0x3f
field public static final int BENGALI = 4; // 0x4
+ field public static final int BHAIKSUKI = 168; // 0xa8
field public static final int BLISSYMBOLS = 64; // 0x40
field public static final int BOOK_PAHLAVI = 124; // 0x7c
field public static final int BOPOMOFO = 5; // 0x5
@@ -15962,6 +16002,7 @@
field public static final int HAN = 17; // 0x11
field public static final int HANGUL = 18; // 0x12
field public static final int HANUNOO = 43; // 0x2b
+ field public static final int HAN_WITH_BOPOMOFO = 172; // 0xac
field public static final int HARAPPAN_INDUS = 77; // 0x4d
field public static final int HATRAN = 162; // 0xa2
field public static final int HEBREW = 19; // 0x13
@@ -15972,6 +16013,7 @@
field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
field public static final int INVALID_CODE = -1; // 0xffffffff
+ field public static final int JAMO = 173; // 0xad
field public static final int JAPANESE = 105; // 0x69
field public static final int JAVANESE = 78; // 0x4e
field public static final int JURCHEN = 148; // 0x94
@@ -16005,6 +16047,7 @@
field public static final int MANDAEAN = 84; // 0x54
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 MATHEMATICAL_NOTATION = 128; // 0x80
field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
field public static final int MEITEI_MAYEK = 115; // 0x73
@@ -16021,6 +16064,7 @@
field public static final int MYANMAR = 28; // 0x1c
field public static final int NABATAEAN = 143; // 0x8f
field public static final int NAKHI_GEBA = 132; // 0x84
+ field public static final int NEWA = 170; // 0xaa
field public static final int NEW_TAI_LUE = 59; // 0x3b
field public static final int NKO = 87; // 0x57
field public static final int NUSHU = 150; // 0x96
@@ -16035,6 +16079,7 @@
field public static final int OL_CHIKI = 109; // 0x6d
field public static final int ORIYA = 31; // 0x1f
field public static final int ORKHON = 88; // 0x58
+ field public static final int OSAGE = 171; // 0xab
field public static final int OSMANYA = 50; // 0x32
field public static final int PAHAWH_HMONG = 75; // 0x4b
field public static final int PALMYRENE = 144; // 0x90
@@ -16060,6 +16105,7 @@
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
+ field public static final int SYMBOLS_EMOJI = 174; // 0xae
field public static final int SYRIAC = 34; // 0x22
field public static final int TAGALOG = 42; // 0x2a
field public static final int TAGBANWA = 45; // 0x2d
@@ -16586,6 +16632,8 @@
method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_MULTIPLE_PATTERNS_FOR_MATCH;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_PARTIAL_LITERAL_MATCH;
}
public static class DateFormat.Field extends java.text.Format.Field {
@@ -17270,6 +17318,7 @@
field public static final int PERCENTSTYLE = 2; // 0x2
field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
field public static final int SCIENTIFICSTYLE = 3; // 0x3
+ field public static final int STANDARDCURRENCYSTYLE = 9; // 0x9
}
public static class NumberFormat.Field extends java.text.Format.Field {
@@ -18064,7 +18113,7 @@
field public static final int AM_PM = 9; // 0x9
field public static final int APRIL = 3; // 0x3
field public static final int AUGUST = 7; // 0x7
- field protected static final int BASE_FIELD_COUNT = 23; // 0x17
+ field protected static final deprecated int BASE_FIELD_COUNT = 23; // 0x17
field public static final int DATE = 5; // 0x5
field public static final int DAY_OF_MONTH = 5; // 0x5
field public static final int DAY_OF_WEEK = 7; // 0x7
@@ -18092,7 +18141,7 @@
field public static final int MARCH = 2; // 0x2
field protected static final int MAXIMUM = 3; // 0x3
field protected static final java.util.Date MAX_DATE;
- field protected static final int MAX_FIELD_COUNT = 32; // 0x20
+ field protected static final deprecated int MAX_FIELD_COUNT = 32; // 0x20
field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
field public static final int MAY = 4; // 0x4
@@ -18412,6 +18461,7 @@
field public static final android.icu.util.MeasureUnit CELSIUS;
field public static final android.icu.util.MeasureUnit CENTILITER;
field public static final android.icu.util.MeasureUnit CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CENTURY;
field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
field public static final android.icu.util.MeasureUnit CUBIC_INCH;
@@ -18420,6 +18470,7 @@
field public static final android.icu.util.MeasureUnit CUBIC_MILE;
field public static final android.icu.util.MeasureUnit CUBIC_YARD;
field public static final android.icu.util.MeasureUnit CUP;
+ field public static final android.icu.util.MeasureUnit CUP_METRIC;
field public static final android.icu.util.TimeUnit DAY;
field public static final android.icu.util.MeasureUnit DECILITER;
field public static final android.icu.util.MeasureUnit DECIMETER;
@@ -18431,6 +18482,7 @@
field public static final android.icu.util.MeasureUnit FOOT;
field public static final android.icu.util.MeasureUnit FURLONG;
field public static final android.icu.util.MeasureUnit GALLON;
+ field public static final android.icu.util.MeasureUnit GENERIC_TEMPERATURE;
field public static final android.icu.util.MeasureUnit GIGABIT;
field public static final android.icu.util.MeasureUnit GIGABYTE;
field public static final android.icu.util.MeasureUnit GIGAHERTZ;
@@ -18458,8 +18510,10 @@
field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
field public static final android.icu.util.MeasureUnit KILOWATT;
field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
+ field public static final android.icu.util.MeasureUnit KNOT;
field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
field public static final android.icu.util.MeasureUnit LITER;
+ field public static final android.icu.util.MeasureUnit LITER_PER_100KILOMETERS;
field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
field public static final android.icu.util.MeasureUnit LUX;
field public static final android.icu.util.MeasureUnit MEGABIT;
@@ -18477,6 +18531,7 @@
field public static final android.icu.util.MeasureUnit MILE;
field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit MILE_SCANDINAVIAN;
field public static final android.icu.util.MeasureUnit MILLIAMPERE;
field public static final android.icu.util.MeasureUnit MILLIBAR;
field public static final android.icu.util.MeasureUnit MILLIGRAM;
@@ -18496,10 +18551,12 @@
field public static final android.icu.util.MeasureUnit PARSEC;
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;
field public static final android.icu.util.MeasureUnit POUND;
field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
field public static final android.icu.util.MeasureUnit QUART;
field public static final android.icu.util.MeasureUnit RADIAN;
+ field public static final android.icu.util.MeasureUnit REVOLUTION_ANGLE;
field public static final android.icu.util.TimeUnit SECOND;
field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
@@ -18811,6 +18868,7 @@
field public static final android.icu.util.VersionInfo UNICODE_6_3;
field public static final android.icu.util.VersionInfo UNICODE_7_0;
field public static final android.icu.util.VersionInfo UNICODE_8_0;
+ field public static final android.icu.util.VersionInfo UNICODE_9_0;
}
}
diff --git a/api/system-current.txt b/api/system-current.txt
index cb3b87b..f0ae379 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16160,6 +16160,10 @@
field public static final int CONTROL = 1; // 0x1
field public static final int CR = 2; // 0x2
field public static final int EXTEND = 3; // 0x3
+ field public static final int E_BASE = 13; // 0xd
+ field public static final int E_BASE_GAZ = 14; // 0xe
+ field public static final int E_MODIFIER = 15; // 0xf
+ field public static final int GLUE_AFTER_ZWJ = 16; // 0x10
field public static final int L = 4; // 0x4
field public static final int LF = 5; // 0x5
field public static final int LV = 6; // 0x6
@@ -16170,6 +16174,7 @@
field public static final int SPACING_MARK = 10; // 0xa
field public static final int T = 8; // 0x8
field public static final int V = 9; // 0x9
+ field public static final int ZWJ = 17; // 0x11
}
public static abstract interface UCharacter.HangulSyllableType {
@@ -16182,6 +16187,9 @@
}
public static abstract interface UCharacter.JoiningGroup {
+ field public static final int AFRICAN_FEH = 86; // 0x56
+ field public static final int AFRICAN_NOON = 87; // 0x57
+ field public static final int AFRICAN_QAF = 88; // 0x58
field public static final int AIN = 1; // 0x1
field public static final int ALAPH = 2; // 0x2
field public static final int ALEF = 3; // 0x3
@@ -16295,6 +16303,8 @@
field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
field public static final int CONTINGENT_BREAK = 7; // 0x7
field public static final int EXCLAMATION = 11; // 0xb
+ field public static final int E_BASE = 40; // 0x28
+ field public static final int E_MODIFIER = 41; // 0x29
field public static final int GLUE = 12; // 0xc
field public static final int H2 = 31; // 0x1f
field public static final int H3 = 32; // 0x20
@@ -16321,6 +16331,7 @@
field public static final int SURROGATE = 25; // 0x19
field public static final int UNKNOWN = 0; // 0x0
field public static final int WORD_JOINER = 30; // 0x1e
+ field public static final int ZWJ = 42; // 0x2a
field public static final int ZWSPACE = 28; // 0x1c
}
@@ -16354,6 +16365,8 @@
method public int getID();
method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ADLAM;
+ field public static final int ADLAM_ID = 263; // 0x107
field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
@@ -16402,6 +16415,8 @@
field public static final int BATAK_ID = 199; // 0xc7
field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
field public static final int BENGALI_ID = 16; // 0x10
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BHAIKSUKI;
+ field public static final int BHAIKSUKI_ID = 264; // 0x108
field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
@@ -16491,6 +16506,8 @@
field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_C;
+ field public static final int CYRILLIC_EXTENDED_C_ID = 265; // 0x109
field public static final int CYRILLIC_ID = 9; // 0x9
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
@@ -16544,6 +16561,8 @@
field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
field public static final int GLAGOLITIC_ID = 136; // 0x88
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC_SUPPLEMENT;
+ field public static final int GLAGOLITIC_SUPPLEMENT_ID = 266; // 0x10a
field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
field public static final int GOTHIC_ID = 89; // 0x59
field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
@@ -16582,6 +16601,8 @@
field public static final int HIRAGANA_ID = 62; // 0x3e
field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION;
+ field public static final int IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION_ID = 267; // 0x10b
field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
@@ -16666,6 +16687,8 @@
field public static final int MANDAIC_ID = 198; // 0xc6
field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
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 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;
@@ -16700,6 +16723,8 @@
field public static final int MODI_ID = 236; // 0xec
field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
field public static final int MONGOLIAN_ID = 37; // 0x25
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN_SUPPLEMENT;
+ field public static final int MONGOLIAN_SUPPLEMENT_ID = 269; // 0x10d
field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
field public static final int MRO_ID = 237; // 0xed
field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
@@ -16714,6 +16739,8 @@
field public static final int MYANMAR_ID = 28; // 0x1c
field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
field public static final int NABATAEAN_ID = 239; // 0xef
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NEWA;
+ field public static final int NEWA_ID = 270; // 0x10e
field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
@@ -16745,6 +16772,8 @@
field public static final int ORIYA_ID = 19; // 0x13
field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OSAGE;
+ field public static final int OSAGE_ID = 271; // 0x10f
field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
field public static final int OSMANYA_ID = 122; // 0x7a
field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
@@ -16847,6 +16876,10 @@
field public static final int TAKRI_ID = 220; // 0xdc
field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
field public static final int TAMIL_ID = 20; // 0x14
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT_COMPONENTS;
+ field public static final int TANGUT_COMPONENTS_ID = 273; // 0x111
+ field public static final int TANGUT_ID = 272; // 0x110
field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
field public static final int TELUGU_ID = 21; // 0x15
field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
@@ -16893,7 +16926,11 @@
field public static final int DOUBLE_QUOTE = 16; // 0x10
field public static final int EXTEND = 9; // 0x9
field public static final int EXTENDNUMLET = 7; // 0x7
+ field public static final int E_BASE = 17; // 0x11
+ field public static final int E_BASE_GAZ = 18; // 0x12
+ field public static final int E_MODIFIER = 19; // 0x13
field public static final int FORMAT = 2; // 0x2
+ field public static final int GLUE_AFTER_ZWJ = 20; // 0x14
field public static final int HEBREW_LETTER = 14; // 0xe
field public static final int KATAKANA = 3; // 0x3
field public static final int LF = 10; // 0xa
@@ -16905,6 +16942,7 @@
field public static final int OTHER = 0; // 0x0
field public static final int REGIONAL_INDICATOR = 13; // 0xd
field public static final int SINGLE_QUOTE = 15; // 0xf
+ field public static final int ZWJ = 21; // 0x15
}
public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
@@ -17123,6 +17161,7 @@
method public static final boolean hasScript(int, int);
method public static final boolean isCased(int);
method public static final boolean isRightToLeft(int);
+ field public static final int ADLAM = 167; // 0xa7
field public static final int AFAKA = 147; // 0x93
field public static final int AHOM = 161; // 0xa1
field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
@@ -17134,6 +17173,7 @@
field public static final int BASSA_VAH = 134; // 0x86
field public static final int BATAK = 63; // 0x3f
field public static final int BENGALI = 4; // 0x4
+ field public static final int BHAIKSUKI = 168; // 0xa8
field public static final int BLISSYMBOLS = 64; // 0x40
field public static final int BOOK_PAHLAVI = 124; // 0x7c
field public static final int BOPOMOFO = 5; // 0x5
@@ -17172,6 +17212,7 @@
field public static final int HAN = 17; // 0x11
field public static final int HANGUL = 18; // 0x12
field public static final int HANUNOO = 43; // 0x2b
+ field public static final int HAN_WITH_BOPOMOFO = 172; // 0xac
field public static final int HARAPPAN_INDUS = 77; // 0x4d
field public static final int HATRAN = 162; // 0xa2
field public static final int HEBREW = 19; // 0x13
@@ -17182,6 +17223,7 @@
field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
field public static final int INVALID_CODE = -1; // 0xffffffff
+ field public static final int JAMO = 173; // 0xad
field public static final int JAPANESE = 105; // 0x69
field public static final int JAVANESE = 78; // 0x4e
field public static final int JURCHEN = 148; // 0x94
@@ -17215,6 +17257,7 @@
field public static final int MANDAEAN = 84; // 0x54
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 MATHEMATICAL_NOTATION = 128; // 0x80
field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
field public static final int MEITEI_MAYEK = 115; // 0x73
@@ -17231,6 +17274,7 @@
field public static final int MYANMAR = 28; // 0x1c
field public static final int NABATAEAN = 143; // 0x8f
field public static final int NAKHI_GEBA = 132; // 0x84
+ field public static final int NEWA = 170; // 0xaa
field public static final int NEW_TAI_LUE = 59; // 0x3b
field public static final int NKO = 87; // 0x57
field public static final int NUSHU = 150; // 0x96
@@ -17245,6 +17289,7 @@
field public static final int OL_CHIKI = 109; // 0x6d
field public static final int ORIYA = 31; // 0x1f
field public static final int ORKHON = 88; // 0x58
+ field public static final int OSAGE = 171; // 0xab
field public static final int OSMANYA = 50; // 0x32
field public static final int PAHAWH_HMONG = 75; // 0x4b
field public static final int PALMYRENE = 144; // 0x90
@@ -17270,6 +17315,7 @@
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
+ field public static final int SYMBOLS_EMOJI = 174; // 0xae
field public static final int SYRIAC = 34; // 0x22
field public static final int TAGALOG = 42; // 0x2a
field public static final int TAGBANWA = 45; // 0x2d
@@ -17796,6 +17842,8 @@
method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_MULTIPLE_PATTERNS_FOR_MATCH;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_PARTIAL_LITERAL_MATCH;
}
public static class DateFormat.Field extends java.text.Format.Field {
@@ -18480,6 +18528,7 @@
field public static final int PERCENTSTYLE = 2; // 0x2
field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
field public static final int SCIENTIFICSTYLE = 3; // 0x3
+ field public static final int STANDARDCURRENCYSTYLE = 9; // 0x9
}
public static class NumberFormat.Field extends java.text.Format.Field {
@@ -19274,7 +19323,7 @@
field public static final int AM_PM = 9; // 0x9
field public static final int APRIL = 3; // 0x3
field public static final int AUGUST = 7; // 0x7
- field protected static final int BASE_FIELD_COUNT = 23; // 0x17
+ field protected static final deprecated int BASE_FIELD_COUNT = 23; // 0x17
field public static final int DATE = 5; // 0x5
field public static final int DAY_OF_MONTH = 5; // 0x5
field public static final int DAY_OF_WEEK = 7; // 0x7
@@ -19302,7 +19351,7 @@
field public static final int MARCH = 2; // 0x2
field protected static final int MAXIMUM = 3; // 0x3
field protected static final java.util.Date MAX_DATE;
- field protected static final int MAX_FIELD_COUNT = 32; // 0x20
+ field protected static final deprecated int MAX_FIELD_COUNT = 32; // 0x20
field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
field public static final int MAY = 4; // 0x4
@@ -19622,6 +19671,7 @@
field public static final android.icu.util.MeasureUnit CELSIUS;
field public static final android.icu.util.MeasureUnit CENTILITER;
field public static final android.icu.util.MeasureUnit CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CENTURY;
field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
field public static final android.icu.util.MeasureUnit CUBIC_INCH;
@@ -19630,6 +19680,7 @@
field public static final android.icu.util.MeasureUnit CUBIC_MILE;
field public static final android.icu.util.MeasureUnit CUBIC_YARD;
field public static final android.icu.util.MeasureUnit CUP;
+ field public static final android.icu.util.MeasureUnit CUP_METRIC;
field public static final android.icu.util.TimeUnit DAY;
field public static final android.icu.util.MeasureUnit DECILITER;
field public static final android.icu.util.MeasureUnit DECIMETER;
@@ -19641,6 +19692,7 @@
field public static final android.icu.util.MeasureUnit FOOT;
field public static final android.icu.util.MeasureUnit FURLONG;
field public static final android.icu.util.MeasureUnit GALLON;
+ field public static final android.icu.util.MeasureUnit GENERIC_TEMPERATURE;
field public static final android.icu.util.MeasureUnit GIGABIT;
field public static final android.icu.util.MeasureUnit GIGABYTE;
field public static final android.icu.util.MeasureUnit GIGAHERTZ;
@@ -19668,8 +19720,10 @@
field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
field public static final android.icu.util.MeasureUnit KILOWATT;
field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
+ field public static final android.icu.util.MeasureUnit KNOT;
field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
field public static final android.icu.util.MeasureUnit LITER;
+ field public static final android.icu.util.MeasureUnit LITER_PER_100KILOMETERS;
field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
field public static final android.icu.util.MeasureUnit LUX;
field public static final android.icu.util.MeasureUnit MEGABIT;
@@ -19687,6 +19741,7 @@
field public static final android.icu.util.MeasureUnit MILE;
field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit MILE_SCANDINAVIAN;
field public static final android.icu.util.MeasureUnit MILLIAMPERE;
field public static final android.icu.util.MeasureUnit MILLIBAR;
field public static final android.icu.util.MeasureUnit MILLIGRAM;
@@ -19706,10 +19761,12 @@
field public static final android.icu.util.MeasureUnit PARSEC;
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;
field public static final android.icu.util.MeasureUnit POUND;
field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
field public static final android.icu.util.MeasureUnit QUART;
field public static final android.icu.util.MeasureUnit RADIAN;
+ field public static final android.icu.util.MeasureUnit REVOLUTION_ANGLE;
field public static final android.icu.util.TimeUnit SECOND;
field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
@@ -20021,6 +20078,7 @@
field public static final android.icu.util.VersionInfo UNICODE_6_3;
field public static final android.icu.util.VersionInfo UNICODE_7_0;
field public static final android.icu.util.VersionInfo UNICODE_8_0;
+ field public static final android.icu.util.VersionInfo UNICODE_9_0;
}
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 74450e6..71a8711 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -14967,6 +14967,10 @@
field public static final int CONTROL = 1; // 0x1
field public static final int CR = 2; // 0x2
field public static final int EXTEND = 3; // 0x3
+ field public static final int E_BASE = 13; // 0xd
+ field public static final int E_BASE_GAZ = 14; // 0xe
+ field public static final int E_MODIFIER = 15; // 0xf
+ field public static final int GLUE_AFTER_ZWJ = 16; // 0x10
field public static final int L = 4; // 0x4
field public static final int LF = 5; // 0x5
field public static final int LV = 6; // 0x6
@@ -14977,6 +14981,7 @@
field public static final int SPACING_MARK = 10; // 0xa
field public static final int T = 8; // 0x8
field public static final int V = 9; // 0x9
+ field public static final int ZWJ = 17; // 0x11
}
public static abstract interface UCharacter.HangulSyllableType {
@@ -14989,6 +14994,9 @@
}
public static abstract interface UCharacter.JoiningGroup {
+ field public static final int AFRICAN_FEH = 86; // 0x56
+ field public static final int AFRICAN_NOON = 87; // 0x57
+ field public static final int AFRICAN_QAF = 88; // 0x58
field public static final int AIN = 1; // 0x1
field public static final int ALAPH = 2; // 0x2
field public static final int ALEF = 3; // 0x3
@@ -15102,6 +15110,8 @@
field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
field public static final int CONTINGENT_BREAK = 7; // 0x7
field public static final int EXCLAMATION = 11; // 0xb
+ field public static final int E_BASE = 40; // 0x28
+ field public static final int E_MODIFIER = 41; // 0x29
field public static final int GLUE = 12; // 0xc
field public static final int H2 = 31; // 0x1f
field public static final int H3 = 32; // 0x20
@@ -15128,6 +15138,7 @@
field public static final int SURROGATE = 25; // 0x19
field public static final int UNKNOWN = 0; // 0x0
field public static final int WORD_JOINER = 30; // 0x1e
+ field public static final int ZWJ = 42; // 0x2a
field public static final int ZWSPACE = 28; // 0x1c
}
@@ -15161,6 +15172,8 @@
method public int getID();
method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ADLAM;
+ field public static final int ADLAM_ID = 263; // 0x107
field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
@@ -15209,6 +15222,8 @@
field public static final int BATAK_ID = 199; // 0xc7
field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
field public static final int BENGALI_ID = 16; // 0x10
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BHAIKSUKI;
+ field public static final int BHAIKSUKI_ID = 264; // 0x108
field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
@@ -15298,6 +15313,8 @@
field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_C;
+ field public static final int CYRILLIC_EXTENDED_C_ID = 265; // 0x109
field public static final int CYRILLIC_ID = 9; // 0x9
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
@@ -15351,6 +15368,8 @@
field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
field public static final int GLAGOLITIC_ID = 136; // 0x88
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC_SUPPLEMENT;
+ field public static final int GLAGOLITIC_SUPPLEMENT_ID = 266; // 0x10a
field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
field public static final int GOTHIC_ID = 89; // 0x59
field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
@@ -15389,6 +15408,8 @@
field public static final int HIRAGANA_ID = 62; // 0x3e
field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION;
+ field public static final int IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION_ID = 267; // 0x10b
field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
@@ -15473,6 +15494,8 @@
field public static final int MANDAIC_ID = 198; // 0xc6
field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
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 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;
@@ -15507,6 +15530,8 @@
field public static final int MODI_ID = 236; // 0xec
field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
field public static final int MONGOLIAN_ID = 37; // 0x25
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN_SUPPLEMENT;
+ field public static final int MONGOLIAN_SUPPLEMENT_ID = 269; // 0x10d
field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
field public static final int MRO_ID = 237; // 0xed
field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
@@ -15521,6 +15546,8 @@
field public static final int MYANMAR_ID = 28; // 0x1c
field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
field public static final int NABATAEAN_ID = 239; // 0xef
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NEWA;
+ field public static final int NEWA_ID = 270; // 0x10e
field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
@@ -15552,6 +15579,8 @@
field public static final int ORIYA_ID = 19; // 0x13
field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OSAGE;
+ field public static final int OSAGE_ID = 271; // 0x10f
field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
field public static final int OSMANYA_ID = 122; // 0x7a
field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
@@ -15654,6 +15683,10 @@
field public static final int TAKRI_ID = 220; // 0xdc
field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
field public static final int TAMIL_ID = 20; // 0x14
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT_COMPONENTS;
+ field public static final int TANGUT_COMPONENTS_ID = 273; // 0x111
+ field public static final int TANGUT_ID = 272; // 0x110
field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
field public static final int TELUGU_ID = 21; // 0x15
field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
@@ -15700,7 +15733,11 @@
field public static final int DOUBLE_QUOTE = 16; // 0x10
field public static final int EXTEND = 9; // 0x9
field public static final int EXTENDNUMLET = 7; // 0x7
+ field public static final int E_BASE = 17; // 0x11
+ field public static final int E_BASE_GAZ = 18; // 0x12
+ field public static final int E_MODIFIER = 19; // 0x13
field public static final int FORMAT = 2; // 0x2
+ field public static final int GLUE_AFTER_ZWJ = 20; // 0x14
field public static final int HEBREW_LETTER = 14; // 0xe
field public static final int KATAKANA = 3; // 0x3
field public static final int LF = 10; // 0xa
@@ -15712,6 +15749,7 @@
field public static final int OTHER = 0; // 0x0
field public static final int REGIONAL_INDICATOR = 13; // 0xd
field public static final int SINGLE_QUOTE = 15; // 0xf
+ field public static final int ZWJ = 21; // 0x15
}
public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
@@ -15930,6 +15968,7 @@
method public static final boolean hasScript(int, int);
method public static final boolean isCased(int);
method public static final boolean isRightToLeft(int);
+ field public static final int ADLAM = 167; // 0xa7
field public static final int AFAKA = 147; // 0x93
field public static final int AHOM = 161; // 0xa1
field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
@@ -15941,6 +15980,7 @@
field public static final int BASSA_VAH = 134; // 0x86
field public static final int BATAK = 63; // 0x3f
field public static final int BENGALI = 4; // 0x4
+ field public static final int BHAIKSUKI = 168; // 0xa8
field public static final int BLISSYMBOLS = 64; // 0x40
field public static final int BOOK_PAHLAVI = 124; // 0x7c
field public static final int BOPOMOFO = 5; // 0x5
@@ -15979,6 +16019,7 @@
field public static final int HAN = 17; // 0x11
field public static final int HANGUL = 18; // 0x12
field public static final int HANUNOO = 43; // 0x2b
+ field public static final int HAN_WITH_BOPOMOFO = 172; // 0xac
field public static final int HARAPPAN_INDUS = 77; // 0x4d
field public static final int HATRAN = 162; // 0xa2
field public static final int HEBREW = 19; // 0x13
@@ -15989,6 +16030,7 @@
field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
field public static final int INVALID_CODE = -1; // 0xffffffff
+ field public static final int JAMO = 173; // 0xad
field public static final int JAPANESE = 105; // 0x69
field public static final int JAVANESE = 78; // 0x4e
field public static final int JURCHEN = 148; // 0x94
@@ -16022,6 +16064,7 @@
field public static final int MANDAEAN = 84; // 0x54
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 MATHEMATICAL_NOTATION = 128; // 0x80
field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
field public static final int MEITEI_MAYEK = 115; // 0x73
@@ -16038,6 +16081,7 @@
field public static final int MYANMAR = 28; // 0x1c
field public static final int NABATAEAN = 143; // 0x8f
field public static final int NAKHI_GEBA = 132; // 0x84
+ field public static final int NEWA = 170; // 0xaa
field public static final int NEW_TAI_LUE = 59; // 0x3b
field public static final int NKO = 87; // 0x57
field public static final int NUSHU = 150; // 0x96
@@ -16052,6 +16096,7 @@
field public static final int OL_CHIKI = 109; // 0x6d
field public static final int ORIYA = 31; // 0x1f
field public static final int ORKHON = 88; // 0x58
+ field public static final int OSAGE = 171; // 0xab
field public static final int OSMANYA = 50; // 0x32
field public static final int PAHAWH_HMONG = 75; // 0x4b
field public static final int PALMYRENE = 144; // 0x90
@@ -16077,6 +16122,7 @@
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
+ field public static final int SYMBOLS_EMOJI = 174; // 0xae
field public static final int SYRIAC = 34; // 0x22
field public static final int TAGALOG = 42; // 0x2a
field public static final int TAGBANWA = 45; // 0x2d
@@ -16603,6 +16649,8 @@
method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_MULTIPLE_PATTERNS_FOR_MATCH;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_PARTIAL_LITERAL_MATCH;
}
public static class DateFormat.Field extends java.text.Format.Field {
@@ -17287,6 +17335,7 @@
field public static final int PERCENTSTYLE = 2; // 0x2
field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
field public static final int SCIENTIFICSTYLE = 3; // 0x3
+ field public static final int STANDARDCURRENCYSTYLE = 9; // 0x9
}
public static class NumberFormat.Field extends java.text.Format.Field {
@@ -18081,7 +18130,7 @@
field public static final int AM_PM = 9; // 0x9
field public static final int APRIL = 3; // 0x3
field public static final int AUGUST = 7; // 0x7
- field protected static final int BASE_FIELD_COUNT = 23; // 0x17
+ field protected static final deprecated int BASE_FIELD_COUNT = 23; // 0x17
field public static final int DATE = 5; // 0x5
field public static final int DAY_OF_MONTH = 5; // 0x5
field public static final int DAY_OF_WEEK = 7; // 0x7
@@ -18109,7 +18158,7 @@
field public static final int MARCH = 2; // 0x2
field protected static final int MAXIMUM = 3; // 0x3
field protected static final java.util.Date MAX_DATE;
- field protected static final int MAX_FIELD_COUNT = 32; // 0x20
+ field protected static final deprecated int MAX_FIELD_COUNT = 32; // 0x20
field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
field public static final int MAY = 4; // 0x4
@@ -18429,6 +18478,7 @@
field public static final android.icu.util.MeasureUnit CELSIUS;
field public static final android.icu.util.MeasureUnit CENTILITER;
field public static final android.icu.util.MeasureUnit CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CENTURY;
field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
field public static final android.icu.util.MeasureUnit CUBIC_INCH;
@@ -18437,6 +18487,7 @@
field public static final android.icu.util.MeasureUnit CUBIC_MILE;
field public static final android.icu.util.MeasureUnit CUBIC_YARD;
field public static final android.icu.util.MeasureUnit CUP;
+ field public static final android.icu.util.MeasureUnit CUP_METRIC;
field public static final android.icu.util.TimeUnit DAY;
field public static final android.icu.util.MeasureUnit DECILITER;
field public static final android.icu.util.MeasureUnit DECIMETER;
@@ -18448,6 +18499,7 @@
field public static final android.icu.util.MeasureUnit FOOT;
field public static final android.icu.util.MeasureUnit FURLONG;
field public static final android.icu.util.MeasureUnit GALLON;
+ field public static final android.icu.util.MeasureUnit GENERIC_TEMPERATURE;
field public static final android.icu.util.MeasureUnit GIGABIT;
field public static final android.icu.util.MeasureUnit GIGABYTE;
field public static final android.icu.util.MeasureUnit GIGAHERTZ;
@@ -18475,8 +18527,10 @@
field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
field public static final android.icu.util.MeasureUnit KILOWATT;
field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
+ field public static final android.icu.util.MeasureUnit KNOT;
field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
field public static final android.icu.util.MeasureUnit LITER;
+ field public static final android.icu.util.MeasureUnit LITER_PER_100KILOMETERS;
field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
field public static final android.icu.util.MeasureUnit LUX;
field public static final android.icu.util.MeasureUnit MEGABIT;
@@ -18494,6 +18548,7 @@
field public static final android.icu.util.MeasureUnit MILE;
field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit MILE_SCANDINAVIAN;
field public static final android.icu.util.MeasureUnit MILLIAMPERE;
field public static final android.icu.util.MeasureUnit MILLIBAR;
field public static final android.icu.util.MeasureUnit MILLIGRAM;
@@ -18513,10 +18568,12 @@
field public static final android.icu.util.MeasureUnit PARSEC;
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;
field public static final android.icu.util.MeasureUnit POUND;
field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
field public static final android.icu.util.MeasureUnit QUART;
field public static final android.icu.util.MeasureUnit RADIAN;
+ field public static final android.icu.util.MeasureUnit REVOLUTION_ANGLE;
field public static final android.icu.util.TimeUnit SECOND;
field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
@@ -18828,6 +18885,7 @@
field public static final android.icu.util.VersionInfo UNICODE_6_3;
field public static final android.icu.util.VersionInfo UNICODE_7_0;
field public static final android.icu.util.VersionInfo UNICODE_8_0;
+ field public static final android.icu.util.VersionInfo UNICODE_9_0;
}
}