Revert "Hide new public APIs introduced by ICU 60."
This reverts commit 20d1241cf512b778bcb70f80887277ea4ef45753.
This commit effectively exposes new APIs in ICU 60.
Bug: 68208236
Test: make
Test: Run ./generate_android_icu4j.sh and no new change
Merged-In: Icb36064a234b851794d934d2b8c5dfced2da80c0
Change-Id: If3381e8eff16bea49798db7362e55a05e5b5278c
diff --git a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
index 176e969..e8d5e86 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
@@ -971,19 +971,19 @@
// New blocks in Unicode 10.0
- /** @hide unsupported on Android*/
+ /***/
public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID = 274; /*[2CEB0]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int KANA_EXTENDED_A_ID = 275; /*[1B100]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int MASARAM_GONDI_ID = 276; /*[11D00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int NUSHU_ID = 277; /*[1B170]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int SOYOMBO_ID = 278; /*[11A50]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int SYRIAC_SUPPLEMENT_ID = 279; /*[0860]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int ZANABAZAR_SQUARE_ID = 280; /*[11A00]*/
/**
@@ -2080,23 +2080,23 @@
// New blocks in Unicode 10.0
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F =
new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F", CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID); /*[2CEB0]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock KANA_EXTENDED_A =
new UnicodeBlock("KANA_EXTENDED_A", KANA_EXTENDED_A_ID); /*[1B100]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock MASARAM_GONDI =
new UnicodeBlock("MASARAM_GONDI", MASARAM_GONDI_ID); /*[11D00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock NUSHU = new UnicodeBlock("NUSHU", NUSHU_ID); /*[1B170]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock SOYOMBO = new UnicodeBlock("SOYOMBO", SOYOMBO_ID); /*[11A50]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock SYRIAC_SUPPLEMENT =
new UnicodeBlock("SYRIAC_SUPPLEMENT", SYRIAC_SUPPLEMENT_ID); /*[0860]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock ZANABAZAR_SQUARE =
new UnicodeBlock("ZANABAZAR_SQUARE", ZANABAZAR_SQUARE_ID); /*[11A00]*/
@@ -2614,27 +2614,27 @@
/***/
public static final int AFRICAN_QAF = 88;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_BHA = 89;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_JA = 90;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_LLA = 91;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_LLLA = 92;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_NGA = 93;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_NNA = 94;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_NNNA = 95;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_NYA = 96;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_RA = 97;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_SSA = 98;
- /** @hide unsupported on Android*/
+ /***/
public static final int MALAYALAM_TTA = 99;
/**
diff --git a/android_icu4j/src/main/java/android/icu/lang/UProperty.java b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
index 96859fc..55b195e 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UProperty.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
@@ -457,48 +457,34 @@
/**
* Binary property Emoji.
* See http://www.unicode.org/reports/tr51/#Emoji_Properties
- *
- * @hide unsupported on Android
*/
public static final int EMOJI=57;
/**
* Binary property Emoji_Presentation.
* See http://www.unicode.org/reports/tr51/#Emoji_Properties
- *
- * @hide unsupported on Android
*/
public static final int EMOJI_PRESENTATION=58;
/**
* Binary property Emoji_Modifier.
* See http://www.unicode.org/reports/tr51/#Emoji_Properties
- *
- * @hide unsupported on Android
*/
public static final int EMOJI_MODIFIER=59;
/**
* Binary property Emoji_Modifier_Base.
* See http://www.unicode.org/reports/tr51/#Emoji_Properties
- *
- * @hide unsupported on Android
*/
public static final int EMOJI_MODIFIER_BASE=60;
/**
* Binary property Emoji_Component.
* See http://www.unicode.org/reports/tr51/#Emoji_Properties
- *
- * @hide unsupported on Android
*/
public static final int EMOJI_COMPONENT=61;
/**
* Binary property Regional_Indicator.
- *
- * @hide unsupported on Android
*/
public static final int REGIONAL_INDICATOR=62;
/**
* Binary property Prepended_Concatenation_Mark.
- *
- * @hide unsupported on Android
*/
public static final int PREPENDED_CONCATENATION_MARK=63;
diff --git a/android_icu4j/src/main/java/android/icu/lang/UScript.java b/android_icu4j/src/main/java/android/icu/lang/UScript.java
index 86efa34..42a1094 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UScript.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UScript.java
@@ -818,17 +818,14 @@
/**
* ISO 15924 script code
- * @hide unsupported on Android
*/
public static final int MASARAM_GONDI = 175; /* Gonm */
/**
* ISO 15924 script code
- * @hide unsupported on Android
*/
public static final int SOYOMBO = 176; /* Soyo */
/**
* ISO 15924 script code
- * @hide unsupported on Android
*/
public static final int ZANABAZAR_SQUARE = 177; /* Zanb */
diff --git a/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java b/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
index 1b73173..85fd456 100644
--- a/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
+++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
@@ -250,7 +250,6 @@
* <strong>[icu]</strong> Returns the array of strings used as digits, in order from 0 through 9
* @return The array of ten digit strings
* @see #setDigitStrings(String[])
- * @hide unsupported on Android
*/
public String[] getDigitStrings() {
return digitStrings.clone();
@@ -300,7 +299,6 @@
* @throws NullPointerException if the <code>digitStrings</code> is null.
* @throws IllegalArgumentException if the length of the array is not 10.
* @see #getDigitStrings()
- * @hide unsupported on Android
*/
public void setDigitStrings(String[] digitStrings) {
if (digitStrings == null) {
@@ -401,7 +399,6 @@
* <strong>[icu]</strong> Returns the string used for grouping separator. Different for French, etc.
* @return the grouping separator string
* @see #setGroupingSeparatorString(String)
- * @hide unsupported on Android
*/
public String getGroupingSeparatorString() {
return groupingSeparatorString;
@@ -417,7 +414,6 @@
* @param groupingSeparatorString the grouping separator string
* @throws NullPointerException if <code>groupingSeparatorString</code> is null.
* @see #getGroupingSeparatorString()
- * @hide unsupported on Android
*/
public void setGroupingSeparatorString(String groupingSeparatorString) {
if (groupingSeparatorString == null) {
@@ -453,7 +449,6 @@
* <strong>[icu]</strong> Returns the string used for decimal sign.
* @return the decimal sign string
* @see #setDecimalSeparatorString(String)
- * @hide unsupported on Android
*/
public String getDecimalSeparatorString() {
return decimalSeparatorString;
@@ -469,7 +464,6 @@
* @param decimalSeparatorString the decimal sign string
* @throws NullPointerException if <code>decimalSeparatorString</code> is null.
* @see #getDecimalSeparatorString()
- * @hide unsupported on Android
*/
public void setDecimalSeparatorString(String decimalSeparatorString) {
if (decimalSeparatorString == null) {
@@ -505,7 +499,6 @@
* <strong>[icu]</strong> Returns the string used for permille sign.
* @return the permille string
* @see #setPerMillString(String)
- * @hide unsupported on Android
*/
public String getPerMillString() {
return perMillString;
@@ -521,7 +514,6 @@
* @param perMillString the permille string
* @throws NullPointerException if <code>perMillString</code> is null.
* @see #getPerMillString()
- * @hide unsupported on Android
*/
public void setPerMillString(String perMillString) {
if (perMillString == null) {
@@ -557,7 +549,6 @@
* <strong>[icu]</strong> Returns the string used for percent sign.
* @return the percent string
* @see #setPercentString(String)
- * @hide unsupported on Android
*/
public String getPercentString() {
return percentString;
@@ -573,7 +564,6 @@
* @param percentString the percent string
* @throws NullPointerException if <code>percentString</code> is null.
* @see #getPercentString()
- * @hide unsupported on Android
*/
public void setPercentString(String percentString) {
if (percentString == null) {
@@ -686,7 +676,6 @@
* <strong>[icu]</strong> Returns the string used to represent minus sign.
* @return the minus sign string
* @see #setMinusSignString(String)
- * @hide unsupported on Android
*/
public String getMinusSignString() {
return minusString;
@@ -702,7 +691,6 @@
* @param minusSignString the minus sign string
* @throws NullPointerException if <code>minusSignString</code> is null.
* @see #getGroupingSeparatorString()
- * @hide unsupported on Android
*/
public void setMinusSignString(String minusSignString) {
if (minusSignString == null) {
@@ -745,7 +733,6 @@
/**
* <strong>[icu]</strong> Returns the string used to represent plus sign.
* @return the plus sign string
- * @hide unsupported on Android
*/
public String getPlusSignString() {
return plusString;
@@ -762,7 +749,6 @@
* strings
* @throws NullPointerException if <code>plusSignString</code> is null.
* @see #getPlusSignString()
- * @hide unsupported on Android
*/
public void setPlusSignString(String plusSignString) {
if (plusSignString == null) {
@@ -863,7 +849,6 @@
* <strong>[icu]</strong> Returns the monetary decimal separator string.
* @return the monetary decimal separator string
* @see #setMonetaryDecimalSeparatorString(String)
- * @hide unsupported on Android
*/
public String getMonetaryDecimalSeparatorString() {
return monetarySeparatorString;
@@ -879,7 +864,6 @@
* @param sep the monetary decimal separator string
* @throws NullPointerException if <code>sep</code> is null.
* @see #getMonetaryDecimalSeparatorString()
- * @hide unsupported on Android
*/
public void setMonetaryDecimalSeparatorString(String sep) {
if (sep == null) {
@@ -915,7 +899,6 @@
* <strong>[icu]</strong> Returns the monetary grouping separator.
* @return the monetary grouping separator string
* @see #setMonetaryGroupingSeparatorString(String)
- * @hide unsupported on Android
*/
public String getMonetaryGroupingSeparatorString() {
return monetaryGroupingSeparatorString;
@@ -931,7 +914,6 @@
* @param sep the monetary grouping separator string
* @throws NullPointerException if <code>sep</code> is null.
* @see #getMonetaryGroupingSeparatorString()
- * @hide unsupported on Android
*/
public void setMonetaryGroupingSeparatorString(String sep) {
if (sep == null) {
diff --git a/android_icu4j/src/main/java/android/icu/text/DisplayContext.java b/android_icu4j/src/main/java/android/icu/text/DisplayContext.java
index ce4fcd7..03cf7c4 100644
--- a/android_icu4j/src/main/java/android/icu/text/DisplayContext.java
+++ b/android_icu4j/src/main/java/android/icu/text/DisplayContext.java
@@ -88,13 +88,11 @@
* A possible setting for SUBSTITUTE_HANDLING:
* Returns a fallback value (e.g., the input code) when no data is available.
* This is the default behavior.
- * @hide unsupported on Android
*/
SUBSTITUTE(Type.SUBSTITUTE_HANDLING, 0),
/**
* A possible setting for SUBSTITUTE_HANDLING:
* Returns a null value when no data is available.
- * @hide unsupported on Android
*/
NO_SUBSTITUTE(Type.SUBSTITUTE_HANDLING, 1);
@@ -117,7 +115,6 @@
DISPLAY_LENGTH,
/**
* SUBSTITUTE_HANDLING can be set to SUBSTITUTE or NO_SUBSTITUTE.
- * @hide unsupported on Android
*/
SUBSTITUTE_HANDLING
}
diff --git a/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java b/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
index 85acbcd..4336995 100644
--- a/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
@@ -556,8 +556,6 @@
* @return The display name in the locale and width specified in
* {@link MeasureFormat#getInstance}, or null if there is no display name available
* for the specified unit.
- *
- * @hide unsupported on Android
*/
public String getUnitDisplayName(MeasureUnit unit) {
FormatWidth width = getRegularWidth(formatWidth);
diff --git a/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java b/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
index fba613b..afeb14a 100644
--- a/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
+++ b/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
@@ -456,13 +456,11 @@
/**
* Constant for unit of concentr: millimole-per-liter
- * @hide unsupported on Android
*/
public static final MeasureUnit MILLIMOLE_PER_LITER = MeasureUnit.internalGetInstance("concentr", "millimole-per-liter");
/**
* Constant for unit of concentr: part-per-million
- * @hide unsupported on Android
*/
public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "part-per-million");
diff --git a/android_icu4j/src/main/java/android/icu/util/TimeZone.java b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
index 1a69710..4d3315b 100644
--- a/android_icu4j/src/main/java/android/icu/util/TimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
@@ -221,19 +221,16 @@
public enum SystemTimeZoneType {
/**
* Any system zones.
- * @hide unsupported on Android
*/
ANY,
/**
* Canonical system zones.
- * @hide unsupported on Android
*/
CANONICAL,
/**
* Canonical system zones associated with actual locations.
- * @hide unsupported on Android
*/
CANONICAL_LOCATION,
}
diff --git a/android_icu4j/src/main/java/android/icu/util/VersionInfo.java b/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
index a80834c..9698bf9 100644
--- a/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
+++ b/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
@@ -144,7 +144,6 @@
/**
* Unicode 10.0 version
- * @hide unsupported on Android
*/
public static final VersionInfo UNICODE_10_0;
diff --git a/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java b/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java
index 1863147..a45ba28 100644
--- a/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java
+++ b/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java
@@ -568,71 +568,6 @@
"type:android.icu.text.Collator$CollatorFactory",
"type:android.icu.text.NumberFormat$NumberFormatFactory",
"type:android.icu.text.NumberFormat$SimpleNumberFormatFactory",
-
- // TODO: http:b/68208236. Expose new API from ICU 60
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_BHA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_JA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_LLA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_LLLA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_NGA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_NNA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_NNNA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_NYA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_RA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_SSA",
- "field:android.icu.lang.UCharacter$JoiningGroup#MALAYALAM_TTA",
- "field:android.icu.lang.UCharacter$UnicodeBlock#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F",
- "field:android.icu.lang.UCharacter$UnicodeBlock#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID",
- "field:android.icu.lang.UCharacter$UnicodeBlock#KANA_EXTENDED_A",
- "field:android.icu.lang.UCharacter$UnicodeBlock#KANA_EXTENDED_A_ID",
- "field:android.icu.lang.UCharacter$UnicodeBlock#MASARAM_GONDI",
- "field:android.icu.lang.UCharacter$UnicodeBlock#MASARAM_GONDI_ID",
- "field:android.icu.lang.UCharacter$UnicodeBlock#NUSHU",
- "field:android.icu.lang.UCharacter$UnicodeBlock#NUSHU_ID",
- "field:android.icu.lang.UCharacter$UnicodeBlock#SOYOMBO",
- "field:android.icu.lang.UCharacter$UnicodeBlock#SOYOMBO_ID",
- "field:android.icu.lang.UCharacter$UnicodeBlock#SYRIAC_SUPPLEMENT",
- "field:android.icu.lang.UCharacter$UnicodeBlock#SYRIAC_SUPPLEMENT_ID",
- "field:android.icu.lang.UCharacter$UnicodeBlock#ZANABAZAR_SQUARE",
- "field:android.icu.lang.UCharacter$UnicodeBlock#ZANABAZAR_SQUARE_ID",
- "field:android.icu.lang.UProperty#EMOJI",
- "field:android.icu.lang.UProperty#EMOJI_COMPONENT",
- "field:android.icu.lang.UProperty#EMOJI_MODIFIER",
- "field:android.icu.lang.UProperty#EMOJI_MODIFIER_BASE",
- "field:android.icu.lang.UProperty#EMOJI_PRESENTATION",
- "field:android.icu.lang.UProperty#PREPENDED_CONCATENATION_MARK",
- "field:android.icu.lang.UProperty#REGIONAL_INDICATOR",
- "field:android.icu.lang.UScript#MASARAM_GONDI",
- "field:android.icu.lang.UScript#SOYOMBO",
- "field:android.icu.lang.UScript#ZANABAZAR_SQUARE",
- "field:android.icu.util.VersionInfo#UNICODE_10_0",
- "enumConstant:android.icu.util.TimeZone$SystemTimeZoneType#ANY",
- "enumConstant:android.icu.util.TimeZone$SystemTimeZoneType#CANONICAL",
- "enumConstant:android.icu.util.TimeZone$SystemTimeZoneType#CANONICAL_LOCATION",
- "enumConstant:android.icu.text.DisplayContext#NO_SUBSTITUTE",
- "enumConstant:android.icu.text.DisplayContext#SUBSTITUTE",
- "enumConstant:android.icu.text.DisplayContext$Type#SUBSTITUTE_HANDLING",
- "field:android.icu.util.MeasureUnit#MILLIMOLE_PER_LITER",
- "field:android.icu.util.MeasureUnit#PART_PER_MILLION",
- "method:android.icu.text.DecimalFormatSymbols#getDecimalSeparatorString()",
- "method:android.icu.text.DecimalFormatSymbols#getDigitStrings()",
- "method:android.icu.text.DecimalFormatSymbols#getGroupingSeparatorString()",
- "method:android.icu.text.DecimalFormatSymbols#getMinusSignString()",
- "method:android.icu.text.DecimalFormatSymbols#getMonetaryDecimalSeparatorString()",
- "method:android.icu.text.DecimalFormatSymbols#getMonetaryGroupingSeparatorString()",
- "method:android.icu.text.DecimalFormatSymbols#getPerMillString()",
- "method:android.icu.text.DecimalFormatSymbols#getPercentString()",
- "method:android.icu.text.DecimalFormatSymbols#getPlusSignString()",
- "method:android.icu.text.DecimalFormatSymbols#setDecimalSeparatorString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setDigitStrings(String[])",
- "method:android.icu.text.DecimalFormatSymbols#setGroupingSeparatorString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setMinusSignString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setMonetaryDecimalSeparatorString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setMonetaryGroupingSeparatorString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setPerMillString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setPercentString(String)",
- "method:android.icu.text.DecimalFormatSymbols#setPlusSignString(String)",
- "method:android.icu.text.MeasureFormat#getUnitDisplayName(MeasureUnit)",
};
// The declarations with JavaDocs that have @.jcite tags that should be transformed to doclava
