Latest generated code for android_icu4j
currysrc now uses AST manipulation to add tags. This slightly
modifies the generated source.
Removed various (previously escaped) tags.
Bug: 22023363
Change-Id: Ic6efe075327362efcc90cc3ac23059349e4fbcb5
diff --git a/android_icu4j/src/main/java/android/icu/impl/Assert.java b/android_icu4j/src/main/java/android/icu/impl/Assert.java
index b660508..44cf879 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Assert.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Assert.java
@@ -8,8 +8,9 @@
package android.icu.impl;
// 1.3 compatibility layer
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class Assert {
public static void fail(Exception e) {
diff --git a/android_icu4j/src/main/java/android/icu/impl/CalendarAstronomer.java b/android_icu4j/src/main/java/android/icu/impl/CalendarAstronomer.java
index 2061ca7..bc31de6 100644
--- a/android_icu4j/src/main/java/android/icu/impl/CalendarAstronomer.java
+++ b/android_icu4j/src/main/java/android/icu/impl/CalendarAstronomer.java
@@ -43,7 +43,6 @@
*
* @author Laura Werner
* @author Alan Liu
- * {@literal @}internal
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -57,7 +56,6 @@
/**
* The number of standard hours in one sidereal day.
* Approximately 24.93.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final double SIDEREAL_DAY = 23.93446960027;
@@ -65,7 +63,6 @@
/**
* The number of sidereal hours in one mean solar day.
* Approximately 24.07.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final double SOLAR_DAY = 24.065709816;
@@ -78,7 +75,6 @@
* Approximately 29.53.
*
* @see #SIDEREAL_MONTH
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final double SYNODIC_MONTH = 29.530588853;
@@ -92,7 +88,6 @@
* Approximately 27.32.
*
* @see #SYNODIC_MONTH
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final double SIDEREAL_MONTH = 27.32166;
@@ -104,7 +99,6 @@
* Approximately 365.24
*
* @see #SIDEREAL_YEAR
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final double TROPICAL_YEAR = 365.242191;
@@ -119,7 +113,6 @@
* Approximately 365.25.
*
* @see #TROPICAL_YEAR
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final double SIDEREAL_YEAR = 365.25636;
@@ -130,28 +123,24 @@
/**
* The number of milliseconds in one second.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final int SECOND_MS = 1000;
/**
* The number of milliseconds in one minute.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final int MINUTE_MS = 60*SECOND_MS;
/**
* The number of milliseconds in one hour.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final int HOUR_MS = 60*MINUTE_MS;
/**
* The number of milliseconds in one day.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final long DAY_MS = 24*HOUR_MS;
@@ -163,7 +152,6 @@
* Note that julian day numbers and
* the Julian calendar are <em>not</em> the same thing. Also note that
* julian days start at <em>noon</em>, not midnight.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final long JULIAN_EPOCH_MS = -210866760000000L;
@@ -210,7 +198,6 @@
/**
* Construct a new <code>CalendarAstronomer</code> object that is initialized to
* the current date and time.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public CalendarAstronomer() {
@@ -220,7 +207,6 @@
/**
* Construct a new <code>CalendarAstronomer</code> object that is initialized to
* the specified date and time.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public CalendarAstronomer(Date d) {
@@ -233,7 +219,6 @@
* January 1, 1970 AD (Gregorian).
*
* @see java.util.Date#getTime()
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public CalendarAstronomer(long aTime) {
@@ -252,7 +237,6 @@
* values signify North, negative South.
*
* @see java.util.Date#getTime()
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public CalendarAstronomer(double longitude, double latitude) {
@@ -276,7 +260,6 @@
*
* @see #setDate
* @see #getTime
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public void setTime(long aTime) {
@@ -292,7 +275,6 @@
*
* @see #setTime
* @see #getDate
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public void setDate(Date date) {
@@ -311,7 +293,6 @@
*
* @see #getJulianDay
* @see #JULIAN_EPOCH_MS
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public void setJulianDay(double jdn) {
@@ -327,7 +308,6 @@
*
* @see #setTime
* @see #getDate
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getTime() {
@@ -340,7 +320,6 @@
*
* @see #setDate
* @see #getTime
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Date getDate() {
@@ -354,7 +333,6 @@
*
* @see #setJulianDay
* @see #JULIAN_EPOCH_MS
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getJulianDay() {
@@ -369,7 +347,6 @@
* the number of centuries after 1/1/1900 AD, 12:00 GMT
*
* @see #getJulianDay
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getJulianCentury() {
@@ -381,7 +358,6 @@
/**
* Returns the current Greenwich sidereal time, measured in hours
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getGreenwichSidereal() {
@@ -408,7 +384,6 @@
/**
* Returns the current local sidereal time, measured in hours
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getLocalSidereal() {
@@ -447,7 +422,6 @@
*
* @param ecliptic A point in the sky in ecliptic coordinates.
* @return The corresponding point in equatorial coordinates.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final Equatorial eclipticToEquatorial(Ecliptic ecliptic)
@@ -462,7 +436,6 @@
* @param eclipLat The ecliptic latitude
*
* @return The corresponding point in equatorial coordinates.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final Equatorial eclipticToEquatorial(double eclipLong, double eclipLat)
@@ -491,7 +464,6 @@
* @param eclipLong The ecliptic longitude
*
* @return The corresponding point in equatorial coordinates.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final Equatorial eclipticToEquatorial(double eclipLong)
@@ -500,7 +472,6 @@
}
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Horizon eclipticToHorizon(double eclipLong)
@@ -593,7 +564,6 @@
* Currently, this method uses an approximation of the two-body Kepler's
* equation for the earth and the sun. It does not take into account the
* perturbations caused by the other planets, the moon, etc.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getSunLongitude()
@@ -640,7 +610,6 @@
/**
* The position of the sun at this object's current date and time,
* in equatorial coordinates.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Equatorial getSunPosition() {
@@ -656,7 +625,6 @@
* Constant representing the vernal equinox.
* For use with {@link #getSunTime(SolarLongitude, boolean) getSunTime}.
* Note: In this case, "vernal" refers to the northern hemisphere's seasons.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final SolarLongitude VERNAL_EQUINOX = new SolarLongitude(0);
@@ -665,7 +633,6 @@
* Constant representing the summer solstice.
* For use with {@link #getSunTime(SolarLongitude, boolean) getSunTime}.
* Note: In this case, "summer" refers to the northern hemisphere's seasons.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final SolarLongitude SUMMER_SOLSTICE = new SolarLongitude(PI/2);
@@ -674,7 +641,6 @@
* Constant representing the autumnal equinox.
* For use with {@link #getSunTime(SolarLongitude, boolean) getSunTime}.
* Note: In this case, "autumn" refers to the northern hemisphere's seasons.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final SolarLongitude AUTUMN_EQUINOX = new SolarLongitude(PI);
@@ -683,7 +649,6 @@
* Constant representing the winter solstice.
* For use with {@link #getSunTime(SolarLongitude, boolean) getSunTime}.
* Note: In this case, "winter" refers to the northern hemisphere's seasons.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final SolarLongitude WINTER_SOLSTICE = new SolarLongitude((PI*3)/2);
@@ -691,7 +656,6 @@
/**
* Find the next time at which the sun's ecliptic longitude will have
* the desired value.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getSunTime(double desired, boolean next)
@@ -706,7 +670,6 @@
/**
* Find the next time at which the sun's ecliptic longitude will have
* the desired value.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getSunTime(SolarLongitude desired, boolean next) {
@@ -723,7 +686,6 @@
* computation can flop over into an adjacent day if this object
* is set to a time near local midnight.
*
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getSunRiseSet(boolean rise)
@@ -1038,7 +1000,6 @@
/**
* The position of the moon at the time set on this
* object, in equatorial coordinates.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Equatorial getMoonPosition()
@@ -1127,7 +1088,6 @@
* measured in radians.
*
* @see #getMoonPhase
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getMoonAge() {
@@ -1154,7 +1114,6 @@
* </ul>
*
* @see #getMoonAge
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public double getMoonPhase() {
@@ -1171,7 +1130,6 @@
/**
* Constant representing a new moon.
* For use with {@link #getMoonTime(MoonAge, boolean) getMoonTime}
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final MoonAge NEW_MOON = new MoonAge(0);
@@ -1179,7 +1137,6 @@
/**
* Constant representing the moon's first quarter.
* For use with {@link #getMoonTime(MoonAge, boolean) getMoonTime}
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final MoonAge FIRST_QUARTER = new MoonAge(PI/2);
@@ -1187,7 +1144,6 @@
/**
* Constant representing a full moon.
* For use with {@link #getMoonTime(MoonAge, boolean) getMoonTime}
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final MoonAge FULL_MOON = new MoonAge(PI);
@@ -1195,7 +1151,6 @@
/**
* Constant representing the moon's last quarter.
* For use with {@link #getMoonTime(MoonAge, boolean) getMoonTime}
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final MoonAge LAST_QUARTER = new MoonAge((PI*3)/2);
@@ -1207,7 +1162,6 @@
* @param desired The desired longitude.
* @param next <tt>true</tt> if the next occurrance of the phase
* is desired, <tt>false</tt> for the previous occurrance.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getMoonTime(double desired, boolean next)
@@ -1227,7 +1181,6 @@
* @param desired The desired phase of the moon.
* @param next <tt>true</tt> if the next occurrance of the phase
* is desired, <tt>false</tt> for the previous occurrance.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getMoonTime(MoonAge desired, boolean next) {
@@ -1237,7 +1190,6 @@
/**
* Returns the time (GMT) of sunrise or sunset on the local date to which
* this calendar is currently set.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public long getMoonRiseSet(boolean rise)
@@ -1515,7 +1467,6 @@
//}
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public String local(long localMillis) {
@@ -1538,7 +1489,6 @@
*
* @see CalendarAstronomer.Equatorial
* @see CalendarAstronomer.Horizon
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final class Ecliptic {
@@ -1547,7 +1497,6 @@
* <p>
* @param lat The ecliptic latitude, measured in radians.
* @param lon The ecliptic longitude, measured in radians.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Ecliptic(double lat, double lon) {
@@ -1557,7 +1506,6 @@
/**
* Return a string representation of this object
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public String toString() {
@@ -1568,7 +1516,6 @@
* The ecliptic latitude, in radians. This specifies an object's
* position north or south of the plane of the ecliptic,
* with positive angles representing north.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final double latitude;
@@ -1582,7 +1529,6 @@
* <p>
* A bit of trivia: the first point of Aries is currently in the
* constellation Pisces, due to the precession of the earth's axis.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final double longitude;
@@ -1602,7 +1548,6 @@
*
* @see CalendarAstronomer.Ecliptic
* @see CalendarAstronomer.Horizon
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final class Equatorial {
@@ -1611,7 +1556,6 @@
* <p>
* @param asc The right ascension, measured in radians.
* @param dec The declination, measured in radians.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Equatorial(double asc, double dec) {
@@ -1622,7 +1566,6 @@
/**
* Return a string representation of this object, with the
* angles measured in degrees.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public String toString() {
@@ -1632,7 +1575,6 @@
/**
* Return a string representation of this object with the right ascension
* measured in hours, minutes, and seconds.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public String toHmsString() {
@@ -1644,7 +1586,6 @@
* This is the position east or west along the equator
* relative to the sun's position at the vernal equinox,
* with positive angles representing East.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final double ascension;
@@ -1653,7 +1594,6 @@
* The declination, in radians.
* This is the position north or south of the equatorial plane,
* with positive angles representing north.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final double declination;
@@ -1674,7 +1614,6 @@
*
* @see CalendarAstronomer.Ecliptic
* @see CalendarAstronomer.Equatorial
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public static final class Horizon {
@@ -1683,7 +1622,6 @@
* <p>
* @param alt The altitude, measured in radians above the horizon.
* @param azim The azimuth, measured in radians clockwise from north.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public Horizon(double alt, double azim) {
@@ -1694,7 +1632,6 @@
/**
* Return a string representation of this object, with the
* angles measured in degrees.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public String toString() {
@@ -1703,14 +1640,12 @@
/**
* The object's altitude above the horizon, in radians.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final double altitude;
/**
* The object's direction, in radians clockwise from north.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final double azimuth;
diff --git a/android_icu4j/src/main/java/android/icu/impl/CalendarCache.java b/android_icu4j/src/main/java/android/icu/impl/CalendarCache.java
index 7a89728..6fe7895 100644
--- a/android_icu4j/src/main/java/android/icu/impl/CalendarCache.java
+++ b/android_icu4j/src/main/java/android/icu/impl/CalendarCache.java
@@ -8,7 +8,6 @@
package android.icu.impl;
/**
- * {@literal @}internal
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -16,7 +15,6 @@
public class CalendarCache
{
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public CalendarCache() {
@@ -36,7 +34,6 @@
}
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public synchronized long get(long key) {
@@ -44,7 +41,6 @@
}
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public synchronized void put(long key, long value)
@@ -127,7 +123,6 @@
private long[] values = new long[arraySize];
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
static public long EMPTY = Long.MIN_VALUE;
diff --git a/android_icu4j/src/main/java/android/icu/impl/CalendarData.java b/android_icu4j/src/main/java/android/icu/impl/CalendarData.java
index 2dff442..c914811 100644
--- a/android_icu4j/src/main/java/android/icu/impl/CalendarData.java
+++ b/android_icu4j/src/main/java/android/icu/impl/CalendarData.java
@@ -16,7 +16,6 @@
/**
* This class abstracts access to calendar (Calendar and DateFormat) data.
- * {@literal @}internal ICU 3.0
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -47,7 +46,6 @@
* Load data for calendar. Note, this object owns the resources, do NOT call ures_close()!
*
* @param key Resource key to data
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public ICUResourceBundle get(String key) {
@@ -70,7 +68,6 @@
*
* @param key Resource key to data
* @param subKey Resource key to data
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public ICUResourceBundle get(String key, String subKey) {
@@ -93,7 +90,6 @@
* @param key Resource key to data
* @param contextKey Resource key to data
* @param subKey Resource key to data
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public ICUResourceBundle get(String key, String contextKey, String subKey) {
@@ -117,7 +113,6 @@
* @param set Resource key to data
* @param contextKey Resource key to data
* @param subKey Resource key to data
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public ICUResourceBundle get(String key, String set, String contextKey, String subKey) {
diff --git a/android_icu4j/src/main/java/android/icu/impl/CharacterIteration.java b/android_icu4j/src/main/java/android/icu/impl/CharacterIteration.java
index 0402f9b..38978ea 100644
--- a/android_icu4j/src/main/java/android/icu/impl/CharacterIteration.java
+++ b/android_icu4j/src/main/java/android/icu/impl/CharacterIteration.java
@@ -11,8 +11,9 @@
import android.icu.text.UTF16;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class CharacterIteration {
// disallow instantiation
diff --git a/android_icu4j/src/main/java/android/icu/impl/CurrencyData.java b/android_icu4j/src/main/java/android/icu/impl/CurrencyData.java
index ed5eaea..264f198 100644
--- a/android_icu4j/src/main/java/android/icu/impl/CurrencyData.java
+++ b/android_icu4j/src/main/java/android/icu/impl/CurrencyData.java
@@ -13,8 +13,9 @@
import android.icu.text.CurrencyDisplayNames;
import android.icu.util.ULocale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class CurrencyData {
public static final CurrencyDisplayInfoProvider provider;
diff --git a/android_icu4j/src/main/java/android/icu/impl/DateNumberFormat.java b/android_icu4j/src/main/java/android/icu/impl/DateNumberFormat.java
index b8b27a7..cc61c3b 100644
--- a/android_icu4j/src/main/java/android/icu/impl/DateNumberFormat.java
+++ b/android_icu4j/src/main/java/android/icu/impl/DateNumberFormat.java
@@ -26,8 +26,9 @@
* used by SimpleDateFormat implementation.
* This class is not thread-safe.
*/
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class DateNumberFormat extends NumberFormat {
diff --git a/android_icu4j/src/main/java/android/icu/impl/DontCareFieldPosition.java b/android_icu4j/src/main/java/android/icu/impl/DontCareFieldPosition.java
index bf56017..cbd29d0 100644
--- a/android_icu4j/src/main/java/android/icu/impl/DontCareFieldPosition.java
+++ b/android_icu4j/src/main/java/android/icu/impl/DontCareFieldPosition.java
@@ -17,9 +17,9 @@
* <p>
* A <code>format</code> method use <code>fpos == DontCareFieldPosition.INSTANCE</code>
* to tell whether or not it needs to calculate a field position.
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public final class DontCareFieldPosition extends FieldPosition {
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java b/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java
index 6a05477..ca7313a 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java
@@ -25,8 +25,9 @@
import android.icu.util.ICUUncheckedIOException;
import android.icu.util.VersionInfo;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class ICUBinary {
/**
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUCache.java b/android_icu4j/src/main/java/android/icu/impl/ICUCache.java
index 4d6ce6b..790ad12 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUCache.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUCache.java
@@ -8,8 +8,9 @@
package android.icu.impl;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public interface ICUCache<K, V> {
// Type of reference holding the Map instance
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUCurrencyDisplayInfoProvider.java b/android_icu4j/src/main/java/android/icu/impl/ICUCurrencyDisplayInfoProvider.java
index a74ab90..ae4c791 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUCurrencyDisplayInfoProvider.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUCurrencyDisplayInfoProvider.java
@@ -22,8 +22,9 @@
import android.icu.util.ULocale;
import android.icu.util.UResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class ICUCurrencyDisplayInfoProvider implements CurrencyDisplayInfoProvider {
public ICUCurrencyDisplayInfoProvider() {
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUDataVersion.java b/android_icu4j/src/main/java/android/icu/impl/ICUDataVersion.java
index 16800e2..110d419 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUDataVersion.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUDataVersion.java
@@ -13,8 +13,9 @@
import android.icu.util.UResourceBundle;
import android.icu.util.VersionInfo;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class ICUDataVersion {
private static final String U_ICU_VERSION_BUNDLE = "icuver";
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUDebug.java b/android_icu4j/src/main/java/android/icu/impl/ICUDebug.java
index 135c5c3..2948d3d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUDebug.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUDebug.java
@@ -9,8 +9,9 @@
import android.icu.util.VersionInfo;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class ICUDebug {
private static String params;
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICULangDataTables.java b/android_icu4j/src/main/java/android/icu/impl/ICULangDataTables.java
index fd7fcec..600289a 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICULangDataTables.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICULangDataTables.java
@@ -7,8 +7,9 @@
*/
package android.icu.impl;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class ICULangDataTables extends LocaleDisplayNamesImpl.ICUDataTables {
public ICULangDataTables() {
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICULocaleService.java b/android_icu4j/src/main/java/android/icu/impl/ICULocaleService.java
index 4c925fc..77ccddd 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICULocaleService.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICULocaleService.java
@@ -14,8 +14,9 @@
import android.icu.util.ULocale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class ICULocaleService extends ICUService {
private ULocale fallbackLocale;
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICURegionDataTables.java b/android_icu4j/src/main/java/android/icu/impl/ICURegionDataTables.java
index 07f5d56..ea83135 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICURegionDataTables.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICURegionDataTables.java
@@ -7,8 +7,9 @@
*/
package android.icu.impl;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class ICURegionDataTables extends LocaleDisplayNamesImpl.ICUDataTables {
public ICURegionDataTables() {
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUResourceBundle.java b/android_icu4j/src/main/java/android/icu/impl/ICUResourceBundle.java
index 3650357..15fb2cf 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUResourceBundle.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUResourceBundle.java
@@ -31,8 +31,9 @@
import android.icu.util.UResourceBundleIterator;
import android.icu.util.UResourceTypeMismatchException;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class ICUResourceBundle extends UResourceBundle {
/**
@@ -192,7 +193,6 @@
* @param omitDefault if true, omit keyword and value if default.
* 'de_DE\@collation=standard' -> 'de_DE'
* @return the locale
- * {@literal @}internal ICU 3.0
* @hide draft / provisional / internal are hidden on Android
*/
public static final ULocale getFunctionalEquivalent(String baseName, ClassLoader loader,
@@ -333,7 +333,6 @@
* @param baseName resource specifier
* @param keyword a particular keyword to consider, must match a top level resource name
* within the tree. (i.e. "collations")
- * {@literal @}internal ICU 3.0
* @hide draft / provisional / internal are hidden on Android
*/
public static final String[] getKeywordValues(String baseName, String keyword) {
@@ -1579,7 +1578,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1588,7 +1586,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/impl/IllegalIcuArgumentException.java b/android_icu4j/src/main/java/android/icu/impl/IllegalIcuArgumentException.java
index 9e5814d..fed1905 100644
--- a/android_icu4j/src/main/java/android/icu/impl/IllegalIcuArgumentException.java
+++ b/android_icu4j/src/main/java/android/icu/impl/IllegalIcuArgumentException.java
@@ -9,9 +9,9 @@
/**
* @author markdavis
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public class IllegalIcuArgumentException extends IllegalArgumentException {
private static final long serialVersionUID = 3789261542830211225L;
diff --git a/android_icu4j/src/main/java/android/icu/impl/IntTrieBuilder.java b/android_icu4j/src/main/java/android/icu/impl/IntTrieBuilder.java
index df2acd2..461a52d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/IntTrieBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/impl/IntTrieBuilder.java
@@ -770,7 +770,6 @@
}
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
private void fillBlock(int block, int start, int limit, int value,
diff --git a/android_icu4j/src/main/java/android/icu/impl/InvalidFormatException.java b/android_icu4j/src/main/java/android/icu/impl/InvalidFormatException.java
index 1f0742b..4baf848 100644
--- a/android_icu4j/src/main/java/android/icu/impl/InvalidFormatException.java
+++ b/android_icu4j/src/main/java/android/icu/impl/InvalidFormatException.java
@@ -9,8 +9,9 @@
*/
package android.icu.impl;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class InvalidFormatException extends Exception {
diff --git a/android_icu4j/src/main/java/android/icu/impl/LocaleDisplayNamesImpl.java b/android_icu4j/src/main/java/android/icu/impl/LocaleDisplayNamesImpl.java
index d69a30f..9229cee 100644
--- a/android_icu4j/src/main/java/android/icu/impl/LocaleDisplayNamesImpl.java
+++ b/android_icu4j/src/main/java/android/icu/impl/LocaleDisplayNamesImpl.java
@@ -33,8 +33,9 @@
import android.icu.util.UResourceBundle;
import android.icu.util.UResourceBundleIterator;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class LocaleDisplayNamesImpl extends LocaleDisplayNames {
private final ULocale locale;
diff --git a/android_icu4j/src/main/java/android/icu/impl/Norm2AllModes.java b/android_icu4j/src/main/java/android/icu/impl/Norm2AllModes.java
index 07761a7..8913cd1 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Norm2AllModes.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Norm2AllModes.java
@@ -15,8 +15,9 @@
import android.icu.text.Normalizer2;
import android.icu.util.ICUUncheckedIOException;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class Norm2AllModes {
// Public API dispatch via Normalizer2 subclasses -------------------------- ***
diff --git a/android_icu4j/src/main/java/android/icu/impl/Normalizer2Impl.java b/android_icu4j/src/main/java/android/icu/impl/Normalizer2Impl.java
index df5c917..05e4b56 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Normalizer2Impl.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Normalizer2Impl.java
@@ -18,8 +18,9 @@
import android.icu.util.ICUUncheckedIOException;
import android.icu.util.VersionInfo;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class Normalizer2Impl {
public static final class Hangul {
diff --git a/android_icu4j/src/main/java/android/icu/impl/PVecToTrieCompactHandler.java b/android_icu4j/src/main/java/android/icu/impl/PVecToTrieCompactHandler.java
index 0a9709b..5c23063 100644
--- a/android_icu4j/src/main/java/android/icu/impl/PVecToTrieCompactHandler.java
+++ b/android_icu4j/src/main/java/android/icu/impl/PVecToTrieCompactHandler.java
@@ -14,8 +14,9 @@
import android.icu.impl.PropsVectors.CompactHandler;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class PVecToTrieCompactHandler implements CompactHandler {
public IntTrieBuilder builder;
diff --git a/android_icu4j/src/main/java/android/icu/impl/PropsVectors.java b/android_icu4j/src/main/java/android/icu/impl/PropsVectors.java
index fa94063..3137b12 100644
--- a/android_icu4j/src/main/java/android/icu/impl/PropsVectors.java
+++ b/android_icu4j/src/main/java/android/icu/impl/PropsVectors.java
@@ -12,7 +12,6 @@
* This is a port of the C++ class UPropsVectors from ICU4C
*
* @author Shaopeng Jia
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/impl/Relation.java b/android_icu4j/src/main/java/android/icu/impl/Relation.java
index 9bec477..e4083ca 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Relation.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Relation.java
@@ -27,9 +27,9 @@
* Unlike Map, there is not guaranteed to be a single value per key.
* The Map-like APIs return collections for values.
* @author medavis
-
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+
*/
public class Relation<K, V> implements Freezable<Relation<K,V>> { // TODO: add , Map<K, Collection<V>>, but requires API changes
private Map<K, Set<V>> data;
diff --git a/android_icu4j/src/main/java/android/icu/impl/ResourceBundleWrapper.java b/android_icu4j/src/main/java/android/icu/impl/ResourceBundleWrapper.java
index 24ede22..8a0963b 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ResourceBundleWrapper.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ResourceBundleWrapper.java
@@ -23,9 +23,9 @@
/**
* just a wrapper for Java ListResourceBundles and
* @author ram
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public class ResourceBundleWrapper extends UResourceBundle {
private ResourceBundle bundle = null;
diff --git a/android_icu4j/src/main/java/android/icu/impl/Row.java b/android_icu4j/src/main/java/android/icu/impl/Row.java
index 869ca61..0bb1214 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Row.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Row.java
@@ -12,8 +12,9 @@
import android.icu.util.Freezable;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public class Row<C0, C1, C2, C3, C4> implements java.lang.Comparable, Cloneable,
diff --git a/android_icu4j/src/main/java/android/icu/impl/SimpleCache.java b/android_icu4j/src/main/java/android/icu/impl/SimpleCache.java
index 23b721d..eaafad3 100644
--- a/android_icu4j/src/main/java/android/icu/impl/SimpleCache.java
+++ b/android_icu4j/src/main/java/android/icu/impl/SimpleCache.java
@@ -15,8 +15,9 @@
import java.util.HashMap;
import java.util.Map;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class SimpleCache<K, V> implements ICUCache<K, V> {
private static final int DEFAULT_CAPACITY = 16;
diff --git a/android_icu4j/src/main/java/android/icu/impl/StringRange.java b/android_icu4j/src/main/java/android/icu/impl/StringRange.java
index 5548364..094099e 100644
--- a/android_icu4j/src/main/java/android/icu/impl/StringRange.java
+++ b/android_icu4j/src/main/java/android/icu/impl/StringRange.java
@@ -19,8 +19,9 @@
import android.icu.lang.CharSequences;
import android.icu.util.ICUException;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
@SuppressWarnings("deprecation")
public class StringRange {
diff --git a/android_icu4j/src/main/java/android/icu/impl/Trie2.java b/android_icu4j/src/main/java/android/icu/impl/Trie2.java
index 53bd081..03cba24 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Trie2.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Trie2.java
@@ -25,9 +25,9 @@
* character properties.
*
* This is the second common version of a Unicode trie (hence the name Trie2).
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public abstract class Trie2 implements Iterable<Trie2.Range> {
@@ -623,7 +623,6 @@
* For Java, this is read from the stream into an instance of UTrie2Header.
* (The C version just places a struct over the raw serialized data.)
*
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
static class UTrie2Header {
@@ -841,7 +840,6 @@
* Iteration over a Trie2 first returns all of the ranges that are indexed by code points,
* then returns the special alternate values for the lead surrogates
*
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
class Trie2Iterator implements Iterator<Range> {
diff --git a/android_icu4j/src/main/java/android/icu/impl/Trie2Writable.java b/android_icu4j/src/main/java/android/icu/impl/Trie2Writable.java
index f232d23..062e5eb 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Trie2Writable.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Trie2Writable.java
@@ -12,9 +12,9 @@
*
* A Trie2Writable is a modifiable, or build-time Trie2.
* Functions for reading data from the Trie are all from class Trie2.
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public class Trie2Writable extends Trie2 {
@@ -267,7 +267,6 @@
/**
* No error checking for illegal arguments.
*
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
private int getDataBlock(int c, boolean forLSCP) {
@@ -359,7 +358,6 @@
/**
* initialValue is ignored if overwrite=TRUE
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
private void fillBlock(int block, /*UChar32*/ int start, /*UChar32*/ int limit,
diff --git a/android_icu4j/src/main/java/android/icu/impl/UBiDiProps.java b/android_icu4j/src/main/java/android/icu/impl/UBiDiProps.java
index 03c055f..39847cb 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UBiDiProps.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UBiDiProps.java
@@ -29,8 +29,9 @@
import android.icu.text.UnicodeSet;
import android.icu.util.ICUUncheckedIOException;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UBiDiProps {
// constructors etc. --------------------------------------------------- ***
diff --git a/android_icu4j/src/main/java/android/icu/impl/UCaseProps.java b/android_icu4j/src/main/java/android/icu/impl/UCaseProps.java
index 8baae49..e3c4be4 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UCaseProps.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UCaseProps.java
@@ -31,8 +31,9 @@
import android.icu.util.ICUUncheckedIOException;
import android.icu.util.ULocale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UCaseProps {
@@ -804,7 +805,6 @@
*
* @see ContextIterator
* @see #MAX_STRING_LENGTH
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public final int toFullLower(int c, ContextIterator iter,
@@ -1104,7 +1104,6 @@
/**
* Bit mask for getting just the options from a string compare options word
* that are relevant for case folding (of a single string or code point).
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
private static final int FOLD_CASE_OPTIONS_MASK = 0xff;
diff --git a/android_icu4j/src/main/java/android/icu/impl/UCharArrayIterator.java b/android_icu4j/src/main/java/android/icu/impl/UCharArrayIterator.java
index 38241f8..01f400d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UCharArrayIterator.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UCharArrayIterator.java
@@ -13,9 +13,9 @@
/**
* @author Doug Felt
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public final class UCharArrayIterator extends UCharacterIterator {
diff --git a/android_icu4j/src/main/java/android/icu/impl/UCharacterName.java b/android_icu4j/src/main/java/android/icu/impl/UCharacterName.java
index 8cad239..134e20a 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UCharacterName.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UCharacterName.java
@@ -32,8 +32,8 @@
* Note : 0 - 0x1F are control characters without names in Unicode 3.0
* @author Syn Wee Quek
* @since nov0700
-* @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UCharacterName
diff --git a/android_icu4j/src/main/java/android/icu/impl/UCharacterNameChoice.java b/android_icu4j/src/main/java/android/icu/impl/UCharacterNameChoice.java
index 629b209..6fe287c 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UCharacterNameChoice.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UCharacterNameChoice.java
@@ -16,8 +16,8 @@
* Arguments for <a href=UCharacterName.html>UCharacterName</a>
* @author Syn Wee Quek
* @since oct0600
-* @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public interface UCharacterNameChoice
diff --git a/android_icu4j/src/main/java/android/icu/impl/UCharacterProperty.java b/android_icu4j/src/main/java/android/icu/impl/UCharacterProperty.java
index a1f5d84..cef2963 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UCharacterProperty.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UCharacterProperty.java
@@ -38,8 +38,8 @@
* <a href=UCharacter.html>UCharacter</a>.</p>
* @author Syn Wee Quek
* @since release 2.1, february 1st 2002
-* @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UCharacterProperty
@@ -175,7 +175,6 @@
* [^\p{space}\p{gc=Control}\p{gc=Surrogate}\p{gc=Unassigned}]
* with space=\p{Whitespace} and Control=Cc.
* Implements UCHAR_POSIX_GRAPH.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
private static final boolean isgraphPOSIX(int c) {
diff --git a/android_icu4j/src/main/java/android/icu/impl/UCharacterUtility.java b/android_icu4j/src/main/java/android/icu/impl/UCharacterUtility.java
index 2f02851..5eb60eb 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UCharacterUtility.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UCharacterUtility.java
@@ -12,8 +12,8 @@
* parsing functions. Does not have an analog in the JDK.
* @author Syn Wee Quek
* @since sep2900
-* @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UCharacterUtility
diff --git a/android_icu4j/src/main/java/android/icu/impl/URLHandler.java b/android_icu4j/src/main/java/android/icu/impl/URLHandler.java
index 7409901..0a2f2cd 100644
--- a/android_icu4j/src/main/java/android/icu/impl/URLHandler.java
+++ b/android_icu4j/src/main/java/android/icu/impl/URLHandler.java
@@ -24,8 +24,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public abstract class URLHandler {
public static final String PROPNAME = "urlhandler.props";
diff --git a/android_icu4j/src/main/java/android/icu/impl/USerializedSet.java b/android_icu4j/src/main/java/android/icu/impl/USerializedSet.java
index 4ddf66e..f60c9f3 100644
--- a/android_icu4j/src/main/java/android/icu/impl/USerializedSet.java
+++ b/android_icu4j/src/main/java/android/icu/impl/USerializedSet.java
@@ -17,7 +17,6 @@
* Simple class for handling serialized USet/UnicodeSet structures
* without object creation. See ICU4C icu/source/common/uset.c.
*
- * {@literal @}internal
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
diff --git a/android_icu4j/src/main/java/android/icu/impl/UnicodeRegex.java b/android_icu4j/src/main/java/android/icu/impl/UnicodeRegex.java
index d179ab3..59a43df 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UnicodeRegex.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UnicodeRegex.java
@@ -48,7 +48,6 @@
/**
* Set the symbol table for internal processing
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public SymbolTable getSymbolTable() {
@@ -57,7 +56,6 @@
/**
* Get the symbol table for internal processing
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
public UnicodeRegex setSymbolTable(SymbolTable symbolTable) {
diff --git a/android_icu4j/src/main/java/android/icu/impl/UnicodeSetStringSpan.java b/android_icu4j/src/main/java/android/icu/impl/UnicodeSetStringSpan.java
index 540db46..d3d208d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/UnicodeSetStringSpan.java
+++ b/android_icu4j/src/main/java/android/icu/impl/UnicodeSetStringSpan.java
@@ -21,8 +21,9 @@
* Avoid recursion because of its exponential complexity.
* Instead, try multiple paths at once and track them with an IndexList.
*/
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class UnicodeSetStringSpan {
diff --git a/android_icu4j/src/main/java/android/icu/impl/Utility.java b/android_icu4j/src/main/java/android/icu/impl/Utility.java
index c5a15fa..17b3049 100644
--- a/android_icu4j/src/main/java/android/icu/impl/Utility.java
+++ b/android_icu4j/src/main/java/android/icu/impl/Utility.java
@@ -17,8 +17,9 @@
import android.icu.text.UTF16;
import android.icu.text.UnicodeMatcher;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class Utility {
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/CollationBuilder.java b/android_icu4j/src/main/java/android/icu/impl/coll/CollationBuilder.java
index eb464a7..6d60bd3 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/CollationBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/CollationBuilder.java
@@ -25,8 +25,9 @@
import android.icu.text.UnicodeSetIterator;
import android.icu.util.ULocale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class CollationBuilder extends CollationRuleParser.Sink {
private static final boolean DEBUG = false;
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/CollationCompare.java b/android_icu4j/src/main/java/android/icu/impl/coll/CollationCompare.java
index b3d71d6..c921b42 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/CollationCompare.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/CollationCompare.java
@@ -14,8 +14,9 @@
import android.icu.text.Collator;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class CollationCompare /* all static */ {
public static int compareUpToQuaternary(CollationIterator left, CollationIterator right,
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/CollationFastLatin.java b/android_icu4j/src/main/java/android/icu/impl/coll/CollationFastLatin.java
index 6728268..6015ff6 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/CollationFastLatin.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/CollationFastLatin.java
@@ -15,8 +15,9 @@
import android.icu.lang.UScript;
import android.icu.text.Collator;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class CollationFastLatin /* all static */ {
/**
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/CollationKeys.java b/android_icu4j/src/main/java/android/icu/impl/coll/CollationKeys.java
index d09b1f4..bbbe19b 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/CollationKeys.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/CollationKeys.java
@@ -14,8 +14,9 @@
import android.icu.text.Collator;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class CollationKeys /* all methods are static */ {
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/CollationRuleParser.java b/android_icu4j/src/main/java/android/icu/impl/coll/CollationRuleParser.java
index b77eb2b..5122078 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/CollationRuleParser.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/CollationRuleParser.java
@@ -25,8 +25,9 @@
import android.icu.text.UnicodeSet;
import android.icu.util.ULocale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class CollationRuleParser {
/** Special reset positions. */
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/CollationWeights.java b/android_icu4j/src/main/java/android/icu/impl/coll/CollationWeights.java
index 140dd2e..829be87 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/CollationWeights.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/CollationWeights.java
@@ -156,9 +156,7 @@
}
}
- /** {@literal @}internal
- * @hide draft / provisional / internal are hidden on Android
- */
+ /** @hide draft / provisional / internal are hidden on Android*/
private static final class WeightRange implements Comparable<WeightRange> {
long start, end;
int length, count;
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/ContractionsAndExpansions.java b/android_icu4j/src/main/java/android/icu/impl/coll/ContractionsAndExpansions.java
index 2c98d2c..10c7e91 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/ContractionsAndExpansions.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/ContractionsAndExpansions.java
@@ -19,8 +19,9 @@
import android.icu.util.CharsTrie;
import android.icu.util.CharsTrie.Entry;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class ContractionsAndExpansions {
// C++: The following fields are @internal, only public for access by callback.
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/UVector32.java b/android_icu4j/src/main/java/android/icu/impl/coll/UVector32.java
index a41921e..74279b6 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/UVector32.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/UVector32.java
@@ -13,8 +13,9 @@
// TODO: There must be a Java class for a growable array of ints without auto-boxing to Integer?!
// Keep the API parallel to the C++ version for ease of porting. Port methods only as needed.
// If & when we start using something else, we might keep this as a thin wrapper for porting.
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UVector32 {
public UVector32() {}
diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/UVector64.java b/android_icu4j/src/main/java/android/icu/impl/coll/UVector64.java
index 68ef4c1..fc6585b 100644
--- a/android_icu4j/src/main/java/android/icu/impl/coll/UVector64.java
+++ b/android_icu4j/src/main/java/android/icu/impl/coll/UVector64.java
@@ -13,8 +13,9 @@
// TODO: There must be a Java class for a growable array of longs without auto-boxing to Long?!
// Keep the API parallel to the C++ version for ease of porting. Port methods only as needed.
// If & when we start using something else, we might keep this as a thin wrapper for porting.
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class UVector64 {
public UVector64() {}
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle.java
index 871e3f4..7e2bb43 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle extends ListResourceBundle {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da.java
index ab43fec..16786bb 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_da extends ListResourceBundle
{
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da_DK.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da_DK.java
index de0e6bc..df888f2 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da_DK.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_da_DK.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_da_DK extends ListResourceBundle
{
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de.java
index 7c4896b..ab26933 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_de extends ListResourceBundle {
static private final Object[][] fContents = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_AT.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_AT.java
index e125d90..a30f4b3 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_AT.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_AT.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_de_AT extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_DE.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_DE.java
index 37bb2ca..48219a2 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_DE.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_de_DE.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_de_DE extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el.java
index b1b418e..6373a60 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_el extends ListResourceBundle {
static private final Object[][] fContents =
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el_GR.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el_GR.java
index 881e6f3..2d52134 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el_GR.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_el_GR.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_el_GR extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en.java
index f8bf06c..75047ae 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_en extends ListResourceBundle {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_CA.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_CA.java
index cd52145..5b86887 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_CA.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_CA.java
@@ -14,8 +14,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_en_CA extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_GB.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_GB.java
index 4ba7ec1..10c476b 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_GB.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_GB.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_en_GB extends ListResourceBundle
{
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_US.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_US.java
index 58bd6da..8c6f21d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_US.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_en_US.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_en_US extends ListResourceBundle
{
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es.java
index 716b410..9e3a62a 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_es extends ListResourceBundle {
static private final Object[][] fContents = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es_MX.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es_MX.java
index 3f0c9e0..394b53b 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es_MX.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_es_MX.java
@@ -14,8 +14,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_es_MX extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr.java
index 326c091..aa7aba6 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_fr extends ListResourceBundle {
static private final Object[][] fContents = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_CA.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_CA.java
index a086e75..ee55daa 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_CA.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_CA.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_fr_CA extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_FR.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_FR.java
index cfb13e7..737822c 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_FR.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_fr_FR.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_fr_FR extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it.java
index 95e87cf..26f6b63 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_it extends ListResourceBundle {
static private final Object[][] fContents =
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it_IT.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it_IT.java
index 28dddb9..54c5e3d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it_IT.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_it_IT.java
@@ -15,8 +15,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_it_IT extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw.java
index aac6c64..18f74d4 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw.java
@@ -10,8 +10,9 @@
import java.util.ListResourceBundle;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_iw extends ListResourceBundle {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw_IL.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw_IL.java
index 70004a2..6f9f2ed 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw_IL.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_iw_IL.java
@@ -13,8 +13,9 @@
import android.icu.util.HebrewHoliday;
import android.icu.util.Holiday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_iw_IL extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_ja_JP.java b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_ja_JP.java
index 813ff96..18592e8 100644
--- a/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_ja_JP.java
+++ b/android_icu4j/src/main/java/android/icu/impl/data/HolidayBundle_ja_JP.java
@@ -14,8 +14,9 @@
import android.icu.util.Holiday;
import android.icu.util.SimpleHoliday;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class HolidayBundle_ja_JP extends ListResourceBundle {
static private final Holiday[] fHolidays = {
diff --git a/android_icu4j/src/main/java/android/icu/impl/duration/impl/Utils.java b/android_icu4j/src/main/java/android/icu/impl/duration/impl/Utils.java
index 379c478..ed8f91c 100644
--- a/android_icu4j/src/main/java/android/icu/impl/duration/impl/Utils.java
+++ b/android_icu4j/src/main/java/android/icu/impl/duration/impl/Utils.java
@@ -10,8 +10,9 @@
import java.util.Locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class Utils {
public static final Locale localeFromString(String s) {
diff --git a/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordReader.java b/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordReader.java
index 1739054..852ee34 100644
--- a/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordReader.java
+++ b/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordReader.java
@@ -15,8 +15,9 @@
import android.icu.lang.UCharacter;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class XMLRecordReader implements RecordReader {
private Reader r;
diff --git a/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordWriter.java b/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordWriter.java
index 02d42af..d27a1a9 100644
--- a/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordWriter.java
+++ b/android_icu4j/src/main/java/android/icu/impl/duration/impl/XMLRecordWriter.java
@@ -15,8 +15,9 @@
import android.icu.lang.UCharacter;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class XMLRecordWriter implements RecordWriter {
private Writer w;
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/AsciiUtil.java b/android_icu4j/src/main/java/android/icu/impl/locale/AsciiUtil.java
index 2a4f92d..f92f1ff 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/AsciiUtil.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/AsciiUtil.java
@@ -7,8 +7,9 @@
*/
package android.icu.impl.locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class AsciiUtil {
public static boolean caseIgnoreMatch(String s1, String s2) {
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/BaseLocale.java b/android_icu4j/src/main/java/android/icu/impl/locale/BaseLocale.java
index c697cf9..47b8836 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/BaseLocale.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/BaseLocale.java
@@ -9,8 +9,9 @@
package android.icu.impl.locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class BaseLocale {
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/Extension.java b/android_icu4j/src/main/java/android/icu/impl/locale/Extension.java
index ca4c749..ffef3bb 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/Extension.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/Extension.java
@@ -8,8 +8,9 @@
package android.icu.impl.locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class Extension {
private char _key;
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/InternalLocaleBuilder.java b/android_icu4j/src/main/java/android/icu/impl/locale/InternalLocaleBuilder.java
index 877b6fe..78c1898 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/InternalLocaleBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/InternalLocaleBuilder.java
@@ -13,8 +13,9 @@
import java.util.List;
import java.util.Set;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public final class InternalLocaleBuilder {
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/LanguageTag.java b/android_icu4j/src/main/java/android/icu/impl/locale/LanguageTag.java
index 8713d2e..f669475 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/LanguageTag.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/LanguageTag.java
@@ -14,8 +14,9 @@
import java.util.Map;
import java.util.Set;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class LanguageTag {
private static final boolean JDKIMPL = false;
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleExtensions.java b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleExtensions.java
index 8a844c3..6a4d541 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleExtensions.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleExtensions.java
@@ -19,8 +19,9 @@
import android.icu.impl.locale.InternalLocaleBuilder.CaseInsensitiveString;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class LocaleExtensions {
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleObjectCache.java b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleObjectCache.java
index b973ed8..d061dcc 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleObjectCache.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleObjectCache.java
@@ -11,8 +11,9 @@
import java.lang.ref.SoftReference;
import java.util.concurrent.ConcurrentHashMap;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public abstract class LocaleObjectCache<K, V> {
private ConcurrentHashMap<K, CacheEntry<K, V>> _map;
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleSyntaxException.java b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleSyntaxException.java
index e2c8adf..338790d 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleSyntaxException.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleSyntaxException.java
@@ -7,8 +7,9 @@
*/
package android.icu.impl.locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class LocaleSyntaxException extends Exception {
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/ParseStatus.java b/android_icu4j/src/main/java/android/icu/impl/locale/ParseStatus.java
index 65d24b4..0c66244 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/ParseStatus.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/ParseStatus.java
@@ -7,8 +7,9 @@
*/
package android.icu.impl.locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class ParseStatus {
int _parseLength = 0;
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/StringTokenIterator.java b/android_icu4j/src/main/java/android/icu/impl/locale/StringTokenIterator.java
index 9f6d6f0..0ae44c3 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/StringTokenIterator.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/StringTokenIterator.java
@@ -7,8 +7,9 @@
*/
package android.icu.impl.locale;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class StringTokenIterator {
private String _text;
diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/UnicodeLocaleExtension.java b/android_icu4j/src/main/java/android/icu/impl/locale/UnicodeLocaleExtension.java
index 51261a7..b1df168 100644
--- a/android_icu4j/src/main/java/android/icu/impl/locale/UnicodeLocaleExtension.java
+++ b/android_icu4j/src/main/java/android/icu/impl/locale/UnicodeLocaleExtension.java
@@ -15,8 +15,9 @@
import java.util.TreeMap;
import java.util.TreeSet;
-/** @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+/**
+ * @hide Only a subset of ICU is exposed in Android
+ * @hide All android.icu classes are currently hidden
*/
public class UnicodeLocaleExtension extends Extension {
public static final char SINGLETON = 'u';
diff --git a/android_icu4j/src/main/java/android/icu/impl/text/RbnfScannerProviderImpl.java b/android_icu4j/src/main/java/android/icu/impl/text/RbnfScannerProviderImpl.java
index bdbb941..d7b4e39 100644
--- a/android_icu4j/src/main/java/android/icu/impl/text/RbnfScannerProviderImpl.java
+++ b/android_icu4j/src/main/java/android/icu/impl/text/RbnfScannerProviderImpl.java
@@ -22,7 +22,6 @@
/**
* Returns RbnfLenientScanners that use the old RuleBasedNumberFormat
* implementation behind setLenientParseMode, which is based on Collator.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -34,7 +33,6 @@
private Map<String, RbnfLenientScanner> cache;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -71,7 +69,6 @@
* will accept some text that it won't produce as output. In English, for example,
* it will correctly parse "two hundred zero" and "fifteen hundred".
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -93,7 +90,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/lang/CharSequences.java b/android_icu4j/src/main/java/android/icu/lang/CharSequences.java
index e2e9948..996ad5a 100644
--- a/android_icu4j/src/main/java/android/icu/lang/CharSequences.java
+++ b/android_icu4j/src/main/java/android/icu/lang/CharSequences.java
@@ -21,7 +21,6 @@
* <li>{@link java.lang.Character#toCodePoint(char, char)}</li>
* </ul>
* @author markdavis
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -48,7 +47,6 @@
/**
* Find the longest n such that a[aIndex,n] = b[bIndex,n], and n is on a character boundary.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -74,7 +72,6 @@
/**
* Count the code point length. Unpaired surrogates count as 1.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -98,7 +95,6 @@
* Utility function for comparing codepoint to string without generating new
* string.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -115,7 +111,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -131,7 +126,6 @@
* Actually, there is one difference; a null compares as less.
* Note that this (=String) order is UTF-16 order -- *not* code point order.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -176,7 +170,6 @@
* Actually, there is one difference; a null compares as less.
* Note that this (=String) order is UTF-16 order -- *not* code point order.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -188,7 +181,6 @@
/**
* Return the value of the first code point, if the string is exactly one code point. Otherwise return Integer.MAX_VALUE.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -206,7 +198,6 @@
* Utility function for comparing objects that may be null
* string.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -220,7 +211,6 @@
/**
* Utility for comparing the contents of CharSequences
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -241,7 +231,6 @@
/**
* Utility for comparing the contents of CharSequences
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -254,7 +243,6 @@
/**
* Are we on a character boundary?
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -269,7 +257,6 @@
/**
* Find code point in string.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -293,7 +280,6 @@
* }
* </pre>
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
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 3654d09..e74a18e 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
@@ -33,7 +33,7 @@
import android.icu.util.VersionInfo;
/**
- * {{@literal @}icuenhanced java.lang.Character}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.lang.Character}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>The UCharacter class provides extensions to the {@link java.lang.Character} class.
* These extensions provide support for more Unicode properties.
@@ -149,7 +149,7 @@
* using patterns like [:graph:] or \p{graph}.
* </p>
*
- * {{@literal @}icunote} There are several ICU (and Java) whitespace functions.
+ * <strong>[icu] Note:</strong> There are several ICU (and Java) whitespace functions.
* Comparison:<ul>
* <li> isUWhiteSpace=UCHAR_WHITE_SPACE: Unicode White_Space property;
* most of general categories "Z" (separators) + most whitespace ISO controls
@@ -170,14 +170,14 @@
// public inner classes ----------------------------------------------
/**
- * {{@literal @}icuenhanced java.lang.Character.UnicodeBlock}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.lang.Character.UnicodeBlock}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* A family of character subsets representing the character blocks in the
* Unicode specification, generated from Unicode Data file Blocks.txt.
* Character blocks generally define characters used for a specific script
* or purpose. A character is contained by at most one Unicode block.
*
- * {{@literal @}icunote} All fields named XXX_ID are specific to ICU.
+ * <strong>[icu] Note:</strong> All fields named XXX_ID are specific to ICU.
*/
public static final class UnicodeBlock extends Character.Subset
{
@@ -2039,7 +2039,7 @@
// public methods --------------------------------------------------
/**
- * {{@literal @}icu} Returns the only instance of the UnicodeBlock with the argument ID.
+ * <strong>[icu]</strong> Returns the only instance of the UnicodeBlock with the argument ID.
* If no such ID exists, a INVALID_CODE UnicodeBlock will be returned.
* @param id UnicodeBlock ID
* @return the only instance of the UnicodeBlock with the argument ID
@@ -2072,7 +2072,7 @@
/**
* Cover the JDK 1.5 API. Return the Unicode block with the
- * given name. {{@literal @}icunote} Unlike JDK 1.5, this only matches
+ * given name. <strong>[icu] Note:</strong> Unlike JDK 1.5, this only matches
* against the official UCD name and the Java block name
* (ignoring case).
* @param blockName the name of the block to match
@@ -3036,7 +3036,7 @@
}
/**
- * {{@literal @}icu} Returns the numeric value for a Unicode code point as defined in the
+ * <strong>[icu]</strong> Returns the numeric value for a Unicode code point as defined in the
* Unicode Character Database.</p>
* <p>A "double" return type is necessary because some numeric values are
* fractions, negative, or too large for int.</p>
@@ -3156,7 +3156,7 @@
/**
* Determines if the specified code point is a letter or digit.
- * {{@literal @}icunote} This method, unlike java.lang.Character does not regard the ascii
+ * <strong>[icu] Note:</strong> This method, unlike java.lang.Character does not regard the ascii
* characters 'A' - 'Z' and 'a' - 'z' as digits.
* @param ch code point to determine if it is a letter or a digit
* @return true if code point is a letter or a digit
@@ -3534,7 +3534,7 @@
// extra methods not in java.lang.Character --------------------------
/**
- * {{@literal @}icu} Determines if the code point is a supplementary character.
+ * <strong>[icu]</strong> Determines if the code point is a supplementary character.
* A code point is a supplementary character if and only if it is greater
* than <a href=#SUPPLEMENTARY_MIN_VALUE>SUPPLEMENTARY_MIN_VALUE</a>
* @param ch code point to be determined if it is in the supplementary
@@ -3548,7 +3548,7 @@
}
/**
- * {{@literal @}icu} Determines if the code point is in the BMP plane.
+ * <strong>[icu]</strong> Determines if the code point is in the BMP plane.
* @param ch code point to be determined if it is not a supplementary
* character
* @return true if code point is not a supplementary character
@@ -3559,7 +3559,7 @@
}
/**
- * {{@literal @}icu} Determines whether the specified code point is a printable character
+ * <strong>[icu]</strong> Determines whether the specified code point is a printable character
* according to the Unicode standard.
* @param ch code point to be determined if it is printable
* @return true if the code point is a printable character
@@ -3577,7 +3577,7 @@
}
/**
- * {{@literal @}icu} Determines whether the specified code point is of base form.
+ * <strong>[icu]</strong> Determines whether the specified code point is of base form.
* A code point of base form does not graphically combine with preceding
* characters, and is neither a control nor a format character.
* @param ch code point to be determined if it is of base form
@@ -3601,7 +3601,7 @@
}
/**
- * {{@literal @}icu} Returns the Bidirection property of a code point.
+ * <strong>[icu]</strong> Returns the Bidirection property of a code point.
* For example, 0x0041 (letter A) has the LEFT_TO_RIGHT directional
* property.<br>
* Result returned belongs to the interface
@@ -3628,7 +3628,7 @@
}
/**
- * {{@literal @}icu} Maps the specified code point to a "mirror-image" code point.
+ * <strong>[icu]</strong> Maps the specified code point to a "mirror-image" code point.
* For code points with the "mirrored" property, implementations sometimes
* need a "poor man's" mapping to another code point such that the default
* glyph may serve as the mirror-image of the default glyph of the
@@ -3646,7 +3646,7 @@
}
/**
- * {{@literal @}icu} Maps the specified character to its paired bracket character.
+ * <strong>[icu]</strong> Maps the specified character to its paired bracket character.
* For Bidi_Paired_Bracket_Type!=None, this is the same as getMirror(int).
* Otherwise c itself is returned.
* See http://www.unicode.org/reports/tr9/
@@ -3665,7 +3665,7 @@
}
/**
- * {{@literal @}icu} Returns the combining class of the argument codepoint
+ * <strong>[icu]</strong> Returns the combining class of the argument codepoint
* @param ch code point whose combining is to be retrieved
* @return the combining class of the codepoint
*/
@@ -3675,7 +3675,7 @@
}
/**
- * {{@literal @}icu} A code point is illegal if and only if
+ * <strong>[icu]</strong> A code point is illegal if and only if
* <ul>
* <li> Out of bounds, less than 0 or greater than UCharacter.MAX_VALUE
* <li> A surrogate value, 0xD800 to 0xDFFF
@@ -3703,7 +3703,7 @@
}
/**
- * {{@literal @}icu} A string is legal iff all its code points are legal.
+ * <strong>[icu]</strong> A string is legal iff all its code points are legal.
* A code point is illegal if and only if
* <ul>
* <li> Out of bounds, less than 0 or greater than UCharacter.MAX_VALUE
@@ -3729,7 +3729,7 @@
}
/**
- * {{@literal @}icu} Returns the version of Unicode data used.
+ * <strong>[icu]</strong> Returns the version of Unicode data used.
* @return the unicode version number used
*/
public static VersionInfo getUnicodeVersion()
@@ -3738,7 +3738,7 @@
}
/**
- * {{@literal @}icu} Returns the most current Unicode name of the argument code point, or
+ * <strong>[icu]</strong> Returns the most current Unicode name of the argument code point, or
* null if the character is unassigned or outside the range
* UCharacter.MIN_VALUE and UCharacter.MAX_VALUE or does not have a name.
* <br>
@@ -3753,7 +3753,7 @@
}
/**
- * {{@literal @}icu} Returns the names for each of the characters in a string
+ * <strong>[icu]</strong> Returns the names for each of the characters in a string
* @param s string to format
* @param separator string to go between names
* @return string of names
@@ -3773,7 +3773,7 @@
}
/**
- * {{@literal @}icu} Returns null.
+ * <strong>[icu]</strong> Returns null.
* Used to return the Unicode_1_Name property value which was of little practical value.
* @param ch the code point for which to get the name
* @return null
@@ -3787,7 +3787,7 @@
}
/**
- * {{@literal @}icu} Returns a name for a valid codepoint. Unlike, getName(int) and
+ * <strong>[icu]</strong> Returns a name for a valid codepoint. Unlike, getName(int) and
* getName1_0(int), this method will return a name even for codepoints that
* are not assigned a name in UnicodeData.txt.
* </p>
@@ -3808,7 +3808,7 @@
}
/**
- * {{@literal @}icu} Returns the corrected name from NameAliases.txt if there is one.
+ * <strong>[icu]</strong> Returns the corrected name from NameAliases.txt if there is one.
* Returns null if the character is unassigned or outside the range
* UCharacter.MIN_VALUE and UCharacter.MAX_VALUE or does not have a name.
* <br>
@@ -3823,7 +3823,7 @@
}
/**
- * {{@literal @}icu} Returns null.
+ * <strong>[icu]</strong> Returns null.
* Used to return the ISO 10646 comment for a character.
* The Unicode ISO_Comment property is deprecated and has no values.
*
@@ -3840,7 +3840,7 @@
}
/**
- * {{@literal @}icu} <p>Finds a Unicode code point by its most current Unicode name and
+ * <strong>[icu]</strong> <p>Finds a Unicode code point by its most current Unicode name and
* return its code point value. All Unicode names are in uppercase.</p>
* Note calling any methods related to code point names, e.g. get*Name*()
* incurs a one-time initialisation cost to construct the name tables.
@@ -3854,7 +3854,7 @@
}
/**
- * {{@literal @}icu} Returns -1.
+ * <strong>[icu]</strong> Returns -1.
* <p>Used to find a Unicode character by its version 1.0 Unicode name and return
* its code point value.</p>
* @param name Unicode 1.0 code point name whose code point is to be
@@ -3870,7 +3870,7 @@
}
/**
- * {{@literal @}icu} <p>Find a Unicode character by either its name and return its code
+ * <strong>[icu]</strong> <p>Find a Unicode character by either its name and return its code
* point value. All Unicode names are in uppercase.
* Extended names are all lowercase except for numbers and are contained
* within angle brackets.</p>
@@ -3893,7 +3893,7 @@
}
/**
- * {{@literal @}icu} <p>Find a Unicode character by its corrected name alias and return
+ * <strong>[icu]</strong> <p>Find a Unicode character by its corrected name alias and return
* its code point value. All Unicode names are in uppercase.</p>
* Note calling any methods related to code point names, e.g. get*Name*()
* incurs a one-time initialisation cost to construct the name tables.
@@ -3905,7 +3905,7 @@
}
/**
- * {{@literal @}icu} Return the Unicode name for a given property, as given in the
+ * <strong>[icu]</strong> Return the Unicode name for a given property, as given in the
* Unicode database file PropertyAliases.txt. Most properties
* have more than one name. The nameChoice determines which one
* is returned.
@@ -3942,7 +3942,7 @@
}
/**
- * {{@literal @}icu} Return the UProperty selector for a given property name, as
+ * <strong>[icu]</strong> Return the UProperty selector for a given property name, as
* specified in the Unicode database file PropertyAliases.txt.
* Short, long, and any other variants are recognized.
*
@@ -3971,7 +3971,7 @@
}
/**
- * {{@literal @}icu} Return the Unicode name for a given property value, as given in
+ * <strong>[icu]</strong> Return the Unicode name for a given property value, as given in
* the Unicode database file PropertyValueAliases.txt. Most
* values have more than one name. The nameChoice determines
* which one is returned.
@@ -4043,7 +4043,7 @@
}
/**
- * {{@literal @}icu} Return the property value integer for a given value name, as
+ * <strong>[icu]</strong> Return the property value integer for a given value name, as
* specified in the Unicode database file PropertyValueAliases.txt.
* Short, long, and any other variants are recognized.
*
@@ -4085,7 +4085,6 @@
* @param property Same as {@link #getPropertyValueEnum(int, CharSequence)}
* @param valueAlias Same as {@link #getPropertyValueEnum(int, CharSequence)}
* @return returns UProperty.UNDEFINED if the value is not valid, otherwise the value.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4097,7 +4096,7 @@
/**
- * {{@literal @}icu} Returns a code point corresponding to the two surrogate code units.
+ * <strong>[icu]</strong> Returns a code point corresponding to the two surrogate code units.
*
* @param lead the lead char
* @param trail the trail char
@@ -4114,7 +4113,7 @@
}
/**
- * {{@literal @}icu} Returns the code point corresponding to the BMP code point.
+ * <strong>[icu]</strong> Returns the code point corresponding to the BMP code point.
*
* @param char16 the BMP code point
* @return code point if argument is a valid character.
@@ -4601,7 +4600,6 @@
* @param locale the locale for accessing exceptional behavior (eg for tr).
* @param str the source string to change
* @return the modified string, or the original if no modifications were necessary.
- * {@literal @}internal
* @deprecated ICU internal only
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4654,7 +4652,7 @@
}
/**
- * {{@literal @}icu} <p>Returns the titlecase version of the argument string.</p>
+ * <strong>[icu]</strong> <p>Returns the titlecase version of the argument string.</p>
* <p>Position for titlecasing is determined by the argument break
* iterator, hence the user can customize his break iterator for
* a specialized titlecasing. In this case only the forward iteration
@@ -4681,7 +4679,7 @@
}
/**
- * {{@literal @}icu} The given character is mapped to its case folding equivalent according
+ * <strong>[icu]</strong> The given character is mapped to its case folding equivalent according
* to UnicodeData.txt and CaseFolding.txt; if the character has no case
* folding equivalent, the character itself is returned.
*
@@ -4708,7 +4706,7 @@
}
/**
- * {{@literal @}icu} The given string is mapped to its case folding equivalent according to
+ * <strong>[icu]</strong> The given string is mapped to its case folding equivalent according to
* UnicodeData.txt and CaseFolding.txt; if any character has no case
* folding equivalent, the character itself is returned.
* "Full", multiple-code point case folding mappings are returned here.
@@ -4728,12 +4726,12 @@
}
/**
- * {{@literal @}icu} Option value for case folding: use default mappings defined in
+ * <strong>[icu]</strong> Option value for case folding: use default mappings defined in
* CaseFolding.txt.
*/
public static final int FOLD_CASE_DEFAULT = 0x0000;
/**
- * {{@literal @}icu} Option value for case folding:
+ * <strong>[icu]</strong> Option value for case folding:
* Use the modified set of mappings provided in CaseFolding.txt to handle dotted I
* and dotless i appropriately for Turkic languages (tr, az).
*
@@ -4748,7 +4746,7 @@
public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 0x0001;
/**
- * {{@literal @}icu} The given character is mapped to its case folding equivalent according
+ * <strong>[icu]</strong> The given character is mapped to its case folding equivalent according
* to UnicodeData.txt and CaseFolding.txt; if the character has no case
* folding equivalent, the character itself is returned.
*
@@ -4773,7 +4771,7 @@
}
/**
- * {{@literal @}icu} The given string is mapped to its case folding equivalent according to
+ * <strong>[icu]</strong> The given string is mapped to its case folding equivalent according to
* UnicodeData.txt and CaseFolding.txt; if any character has no case
* folding equivalent, the character itself is returned.
* "Full", multiple-code point case folding mappings are returned here.
@@ -4811,7 +4809,7 @@
}
/**
- * {{@literal @}icu} Returns the numeric value of a Han character.
+ * <strong>[icu]</strong> Returns the numeric value of a Han character.
*
* <p>This returns the value of Han 'numeric' code points,
* including those for zero, ten, hundred, thousand, ten thousand,
@@ -4881,7 +4879,7 @@
}
/**
- * {{@literal @}icu} <p>Returns an iterator for character types, iterating over codepoints.</p>
+ * <strong>[icu]</strong> <p>Returns an iterator for character types, iterating over codepoints.</p>
* Example of use:<br>
* <pre>
* RangeValueIterator iterator = UCharacter.getTypeIterator();
@@ -4937,7 +4935,7 @@
}
/**
- * {{@literal @}icu} <p>Returns an iterator for character names, iterating over codepoints.</p>
+ * <strong>[icu]</strong> <p>Returns an iterator for character names, iterating over codepoints.</p>
* <p>This API only gets the iterator for the modern, most up-to-date
* Unicode names. For older 1.0 Unicode names use get1_0NameIterator() or
* for extended names use getExtendedNameIterator().</p>
@@ -4961,7 +4959,7 @@
}
/**
- * {{@literal @}icu} Returns an empty iterator.
+ * <strong>[icu]</strong> Returns an empty iterator.
* <p>Used to return an iterator for the older 1.0 Unicode character names, iterating over codepoints.</p>
* @return an empty iterator
* @deprecated ICU 49
@@ -4980,7 +4978,7 @@
}
/**
- * {{@literal @}icu} <p>Returns an iterator for character names, iterating over codepoints.</p>
+ * <strong>[icu]</strong> <p>Returns an iterator for character names, iterating over codepoints.</p>
* <p>This API only gets the iterator for the extended names.
* For modern, most up-to-date Unicode names use getNameIterator() or
* for older 1.0 Unicode names use get1_0NameIterator().</p>
@@ -5003,7 +5001,7 @@
}
/**
- * {{@literal @}icu} Returns the "age" of the code point.</p>
+ * <strong>[icu]</strong> Returns the "age" of the code point.</p>
* <p>The "age" is the Unicode version when the code point was first
* designated (as a non-character or for Private Use) or assigned a
* character.
@@ -5022,7 +5020,7 @@
}
/**
- * {{@literal @}icu} <p>Check a binary Unicode property for a code point.</p>
+ * <strong>[icu]</strong> <p>Check a binary Unicode property for a code point.</p>
* <p>Unicode, especially in version 3.2, defines many more properties
* than the original set in UnicodeData.txt.</p>
* <p>This API is intended to reflect Unicode properties as defined in
@@ -5051,7 +5049,7 @@
}
/**
- * {{@literal @}icu} <p>Check if a code point has the Alphabetic Unicode property.</p>
+ * <strong>[icu]</strong> <p>Check if a code point has the Alphabetic Unicode property.</p>
* <p>Same as UCharacter.hasBinaryProperty(ch, UProperty.ALPHABETIC).</p>
* <p>Different from UCharacter.isLetter(ch)!</p>
* @param ch codepoint to be tested
@@ -5062,7 +5060,7 @@
}
/**
- * {{@literal @}icu} <p>Check if a code point has the Lowercase Unicode property.</p>
+ * <strong>[icu]</strong> <p>Check if a code point has the Lowercase Unicode property.</p>
* <p>Same as UCharacter.hasBinaryProperty(ch, UProperty.LOWERCASE).</p>
* <p>This is different from UCharacter.isLowerCase(ch)!</p>
* @param ch codepoint to be tested
@@ -5073,7 +5071,7 @@
}
/**
- * {{@literal @}icu} <p>Check if a code point has the Uppercase Unicode property.</p>
+ * <strong>[icu]</strong> <p>Check if a code point has the Uppercase Unicode property.</p>
* <p>Same as UCharacter.hasBinaryProperty(ch, UProperty.UPPERCASE).</p>
* <p>This is different from UCharacter.isUpperCase(ch)!</p>
* @param ch codepoint to be tested
@@ -5084,7 +5082,7 @@
}
/**
- * {{@literal @}icu} <p>Check if a code point has the White_Space Unicode property.</p>
+ * <strong>[icu]</strong> <p>Check if a code point has the White_Space Unicode property.</p>
* <p>Same as UCharacter.hasBinaryProperty(ch, UProperty.WHITE_SPACE).</p>
* <p>This is different from both UCharacter.isSpace(ch) and
* UCharacter.isWhitespace(ch)!</p>
@@ -5096,7 +5094,7 @@
}
/**
- * {{@literal @}icu} <p>Returns the property value for an Unicode property type of a code point.
+ * <strong>[icu]</strong> <p>Returns the property value for an Unicode property type of a code point.
* Also returns binary and mask property values.</p>
* <p>Unicode, especially in version 3.2, defines many more properties than
* the original set in UnicodeData.txt.</p>
@@ -5138,12 +5136,11 @@
return UCharacterProperty.INSTANCE.getIntPropertyValue(ch, type);
}
/**
- * {{@literal @}icu} Returns a string version of the property value.
+ * <strong>[icu]</strong> Returns a string version of the property value.
* @param propertyEnum The property enum value.
* @param codepoint The codepoint value.
* @param nameChoice The choice of the name.
* @return value as string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -5180,7 +5177,7 @@
///CLOVER:ON
/**
- * {{@literal @}icu} Returns the minimum value for an integer/binary Unicode property type.
+ * <strong>[icu]</strong> Returns the minimum value for an integer/binary Unicode property type.
* Can be used together with UCharacter.getIntPropertyMaxValue(int)
* to allocate arrays of android.icu.text.UnicodeSet or similar.
* @param type UProperty selector constant, identifies which binary
@@ -5203,7 +5200,7 @@
/**
- * {{@literal @}icu} Returns the maximum value for an integer/binary Unicode property.
+ * <strong>[icu]</strong> Returns the maximum value for an integer/binary Unicode property.
* Can be used together with UCharacter.getIntPropertyMinValue(int)
* to allocate arrays of android.icu.text.UnicodeSet or similar.
* Examples for min/max values (for Unicode 3.2):
@@ -5531,10 +5528,10 @@
* Cover the JDK API, for convenience. Return a byte representing the directionality of
* the character.
*
- * {{@literal @}icunote} Unlike the JDK, this returns DIRECTIONALITY_LEFT_TO_RIGHT for undefined
+ * <strong>[icu] Note:</strong> Unlike the JDK, this returns DIRECTIONALITY_LEFT_TO_RIGHT for undefined
* or out-of-bounds characters.
*
- * {{@literal @}icunote} The return value must be tested using the constants defined in {@link
+ * <strong>[icu] Note:</strong> The return value must be tested using the constants defined in {@link
* UCharacterDirection} and its interface {@link
* UCharacterEnums.ECharacterDirection} since the values are different from the ones
* defined by <code>java.lang.Character</code>.
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 eecd62b..2edded0 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UProperty.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
@@ -33,7 +33,6 @@
/**
* Special value indicating undefined property.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/lang/UScriptRun.java b/android_icu4j/src/main/java/android/icu/lang/UScriptRun.java
index 7731000..7dcc90a 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UScriptRun.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UScriptRun.java
@@ -47,7 +47,6 @@
* }
* </pre>
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -60,7 +59,6 @@
* Construct an empty <code>UScriptRun</code> object. The <code>next()</code>
* method will return <code>false</code> the first time it is called.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -78,7 +76,6 @@
*
* @param text the string of characters over which to iterate.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -96,7 +93,6 @@
* @param start the index of the first character over which to iterate
* @param count the number of characters over which to iterate
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -112,7 +108,6 @@
*
* @param chars the array of characters over which to iterate.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -130,7 +125,6 @@
* @param start the index of the first character over which to iterate
* @param count the number of characters over which to iterate
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -144,7 +138,6 @@
/**
* Reset the iterator to the start of the text.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -177,7 +170,6 @@
* @param count the new number of characters over which to iterate.
* @exception IllegalArgumentException If invalid arguments are passed.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -210,7 +202,6 @@
* @param start the index of the first character over which to iterate.
* @param count the number of characters over which to iterate.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -232,7 +223,6 @@
*
* @param chars the new array of characters over which to iterate.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -257,7 +247,6 @@
* @param start the index of the first character over which to iterate.
* @param count the nuber of characters over which to iterate.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -279,7 +268,6 @@
*
* @param str the new string of characters over which to iterate.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -302,7 +290,6 @@
*
* @return the index of the first character in the current script run.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -317,7 +304,6 @@
*
* @return the index of the first character after the current script run.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -333,7 +319,6 @@
* @return the script code for the script of the current script run.
* @see android.icu.lang.UScript
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -349,7 +334,6 @@
*
* @return <code>false</code> if there isn't another run, <code>true</code> if there is.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java b/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java
index fdff3fd..f9c686f 100644
--- a/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java
+++ b/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java
@@ -1178,7 +1178,6 @@
* Return a list of the first character in each script. Only exposed for testing.
*
* @return list of first characters in each script
- * {@literal @}internal
* @deprecated This API is ICU internal, only for testing.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/BreakIterator.java b/android_icu4j/src/main/java/android/icu/text/BreakIterator.java
index 5df0612..af94e50 100644
--- a/android_icu4j/src/main/java/android/icu/text/BreakIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/BreakIterator.java
@@ -19,7 +19,7 @@
import android.icu.util.ULocale;
/**
- * {{@literal @}icuenhanced java.text.BreakIterator}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.BreakIterator}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>A class that locates boundaries in text. This class defines a protocol for
* objects that break up a piece of natural-language text according to a set
@@ -206,8 +206,8 @@
* </blockquote>
*
* @see CharacterIterator
- *
* @hide All android.icu classes are currently hidden
+ *
*/
public abstract class BreakIterator implements Cloneable
@@ -499,23 +499,23 @@
public abstract void setText(CharacterIterator newText);
/**
- * {{@literal @}icu}
+ * <strong>[icu]</strong>
*/
public static final int KIND_CHARACTER = 0;
/**
- * {{@literal @}icu}
+ * <strong>[icu]</strong>
*/
public static final int KIND_WORD = 1;
/**
- * {{@literal @}icu}
+ * <strong>[icu]</strong>
*/
public static final int KIND_LINE = 2;
/**
- * {{@literal @}icu}
+ * <strong>[icu]</strong>
*/
public static final int KIND_SENTENCE = 3;
/**
- * {{@literal @}icu}
+ * <strong>[icu]</strong>
*/
public static final int KIND_TITLE = 4;
@@ -550,7 +550,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates word boundaries.
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates word boundaries.
* @param where A locale specifying the language of the text to be
* analyzed.
* @return An instance of BreakIterator that locates word boundaries.
@@ -587,7 +587,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates legal line-
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates legal line-
* wrapping positions.
* @param where A Locale specifying the language of the text being broken.
* @return A new instance of BreakIterator that locates legal
@@ -625,7 +625,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates logical-character
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates logical-character
* boundaries.
* @param where A Locale specifying the language of the text being analyzed.
* @return A new instance of BreakIterator that locates logical-character
@@ -660,7 +660,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates sentence boundaries.
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates sentence boundaries.
* @param where A Locale specifying the language of the text being analyzed.
* @return A new instance of BreakIterator that locates sentence boundaries.
* @throws NullPointerException if <code>where</code> is null.
@@ -671,7 +671,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates title boundaries.
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates title boundaries.
* This function assumes the text being analyzed is in the default locale's
* language. The iterator returned locates title boundaries as described for
* Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
@@ -684,7 +684,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates title boundaries.
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates title boundaries.
* The iterator returned locates title boundaries as described for
* Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
* please use Word Boundary iterator.{@link #getWordInstance}
@@ -698,7 +698,7 @@
}
/**
- * {{@literal @}icu} Returns a new instance of BreakIterator that locates title boundaries.
+ * <strong>[icu]</strong> Returns a new instance of BreakIterator that locates title boundaries.
* The iterator returned locates title boundaries as described for
* Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
* please use Word Boundary iterator.{@link #getWordInstance}
@@ -711,7 +711,7 @@
}
/**
- * {{@literal @}icu} Registers a new break iterator of the indicated kind, to use in the given
+ * <strong>[icu]</strong> Registers a new break iterator of the indicated kind, to use in the given
* locale. Clones of the iterator will be returned if a request for a break iterator
* of the given kind matches or falls back to this locale.
*
@@ -729,7 +729,7 @@
}
/**
- * {{@literal @}icu} Registers a new break iterator of the indicated kind, to use in the given
+ * <strong>[icu]</strong> Registers a new break iterator of the indicated kind, to use in the given
* locale. Clones of the iterator will be returned if a request for a break iterator
* of the given kind matches or falls back to this locale.
*
@@ -757,7 +757,7 @@
}
/**
- * {{@literal @}icu} Unregisters a previously-registered BreakIterator using the key returned
+ * <strong>[icu]</strong> Unregisters a previously-registered BreakIterator using the key returned
* from the register call. Key becomes invalid after this call and should not be used
* again.
* @param key the registry key returned by a previous call to registerInstance
@@ -795,7 +795,6 @@
/**
* Returns a particular kind of BreakIterator for a locale.
* Avoids writing a switch statement with getXYZInstance(where) calls.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -840,11 +839,9 @@
}
/**
- * {{@literal @}icu} Returns a list of locales for which BreakIterators can be used.
+ * <strong>[icu]</strong> Returns a list of locales for which BreakIterators can be used.
* @return An array of Locales. All of the locales in the array can
* be used when creating a BreakIterator.
- * {@literal @}draft ICU 3.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static synchronized ULocale[] getAvailableULocales()
@@ -910,7 +907,7 @@
// -------- BEGIN ULocale boilerplate --------
/**
- * {{@literal @}icu} Returns the locale that was used to create this object, or null.
+ * <strong>[icu]</strong> Returns the locale that was used to create this object, or null.
* This may may differ from the locale requested at the time of
* this object's creation. For example, if an object is created
* for locale <tt>en_US_CALIFORNIA</tt>, the actual data may be
@@ -928,8 +925,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#VALID_LOCALE
* @see android.icu.util.ULocale#ACTUAL_LOCALE
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale getLocale(ULocale.Type type) {
diff --git a/android_icu4j/src/main/java/android/icu/text/CanonicalIterator.java b/android_icu4j/src/main/java/android/icu/text/CanonicalIterator.java
index 216e218..1cdea55 100644
--- a/android_icu4j/src/main/java/android/icu/text/CanonicalIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/CanonicalIterator.java
@@ -155,7 +155,6 @@
* @param source the string to find permutations for
* @param skipZeros set to true to skip characters with canonical combining class zero
* @param output the set to add the results to
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/CharsetDetector.java b/android_icu4j/src/main/java/android/icu/text/CharsetDetector.java
index e7ca542..63523ab 100644
--- a/android_icu4j/src/main/java/android/icu/text/CharsetDetector.java
+++ b/android_icu4j/src/main/java/android/icu/text/CharsetDetector.java
@@ -497,7 +497,6 @@
* @return an array of the names of charsets that can be recognized by this CharsetDetector
* instance.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -526,7 +525,6 @@
* @throws IllegalArgumentException when the name of charset encoding is
* not supported.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/ChineseDateFormat.java b/android_icu4j/src/main/java/android/icu/text/ChineseDateFormat.java
index a50103d..7764916 100644
--- a/android_icu4j/src/main/java/android/icu/text/ChineseDateFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/ChineseDateFormat.java
@@ -118,7 +118,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/CollationElementIterator.java b/android_icu4j/src/main/java/android/icu/text/CollationElementIterator.java
index c1aed70..79dea25 100644
--- a/android_icu4j/src/main/java/android/icu/text/CollationElementIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/CollationElementIterator.java
@@ -696,7 +696,6 @@
/**
* Mock implementation of hashCode(). This implementation always returns a constant
* value. When Java assertion is enabled, this method triggers an assertion failure.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -708,7 +707,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/Collator.java b/android_icu4j/src/main/java/android/icu/text/Collator.java
index 31c2ba8..e9de986 100644
--- a/android_icu4j/src/main/java/android/icu/text/Collator.java
+++ b/android_icu4j/src/main/java/android/icu/text/Collator.java
@@ -30,7 +30,7 @@
import android.icu.util.VersionInfo;
/**
-* {{@literal @}icuenhanced java.text.Collator}.{{@literal @}icu _usage_}
+* <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.Collator}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>Collator performs locale-sensitive string comparison. A concrete
* subclass, RuleBasedCollator, allows customization of the collation
@@ -129,7 +129,7 @@
* @see RuleBasedCollator
* @see CollationKey
* @author Syn Wee Quek
-* @hide All android.icu classes are currently hidden
+ * @hide All android.icu classes are currently hidden
*/
public abstract class Collator implements Comparator<Object>, Freezable<Collator>, Cloneable
{
@@ -166,7 +166,7 @@
public final static int TERTIARY = 2;
/**
- * {{@literal @}icu} Fourth level collator strength value.
+ * <strong>[icu]</strong> Fourth level collator strength value.
* When punctuation is ignored
* (see <a href="http://userguide.icu-project.org/collation/concepts#TOC-Ignoring-Punctuation">
* Ignoring Punctuation in the User Guide</a>) at PRIMARY to TERTIARY
@@ -192,7 +192,7 @@
public final static int IDENTICAL = 15;
/**
- * {{@literal @}icunote} This is for backwards compatibility with Java APIs only. It
+ * <strong>[icu] Note:</strong> This is for backwards compatibility with Java APIs only. It
* should not be used, IDENTICAL should be used instead. ICU's
* collation does not support Java's FULL_DECOMPOSITION mode.
*/
@@ -334,7 +334,6 @@
/**
* @return this, for chaining
- * {@literal @}internal Used in UnicodeTools
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -753,7 +752,7 @@
}
/**
- * {{@literal @}icu} Returns the Collator for the desired locale.
+ * <strong>[icu]</strong> Returns the Collator for the desired locale.
*
* <p>For some languages, multiple collation types are available;
* for example, "de@collation=phonebook".
@@ -810,7 +809,7 @@
}
/**
- * {{@literal @}icu} Registers a collator as the default collator for the provided locale. The
+ * <strong>[icu]</strong> Registers a collator as the default collator for the provided locale. The
* collator should not be modified after it is registered.
*
* <p>Because ICU may choose to cache Collator objects internally, this must
@@ -826,7 +825,7 @@
}
/**
- * {{@literal @}icu} Registers a collator factory.
+ * <strong>[icu]</strong> Registers a collator factory.
*
* <p>Because ICU may choose to cache Collator objects internally, this must
* be called at application startup, prior to any calls to
@@ -840,7 +839,7 @@
}
/**
- * {{@literal @}icu} Unregisters a collator previously registered using registerInstance.
+ * <strong>[icu]</strong> Unregisters a collator previously registered using registerInstance.
* @param registryKey the object previously returned by registerInstance.
* @return true if the collator was successfully unregistered.
*/
@@ -868,7 +867,7 @@
}
/**
- * {{@literal @}icu} Returns the set of locales, as ULocale objects, for which collators
+ * <strong>[icu]</strong> Returns the set of locales, as ULocale objects, for which collators
* are installed. ULocale objects support RFC 3066.
* @return the list of locales in which collators are installed.
* This list includes any that have been registered, in addition to
@@ -904,7 +903,7 @@
private static final String BASE = ICUResourceBundle.ICU_COLLATION_BASE_NAME;
/**
- * {{@literal @}icu} Returns an array of all possible keywords that are relevant to
+ * <strong>[icu]</strong> Returns an array of all possible keywords that are relevant to
* collation. At this point, the only recognized keyword for this
* service is "collation".
* @return an array of valid collation keywords.
@@ -915,7 +914,7 @@
}
/**
- * {{@literal @}icu} Given a keyword, returns an array of all values for
+ * <strong>[icu]</strong> Given a keyword, returns an array of all values for
* that keyword that are currently in use.
* @param keyword one of the keywords returned by getKeywords.
* @see #getKeywords
@@ -928,7 +927,7 @@
}
/**
- * {{@literal @}icu} Given a key and a locale, returns an array of string values in a preferred
+ * <strong>[icu]</strong> Given a key and a locale, returns an array of string values in a preferred
* order that would make a difference. These are all and only those values where
* the open (creation) of the service with the locale formed from the input locale
* plus input keyword and that value has different behavior than creation with the
@@ -986,7 +985,7 @@
}
/**
- * {{@literal @}icu} Returns the functionally equivalent locale for the given
+ * <strong>[icu]</strong> Returns the functionally equivalent locale for the given
* requested locale, with respect to given keyword, for the
* collation service. If two locales return the same result, then
* collators instantiated for these locales will behave
@@ -1017,7 +1016,7 @@
}
/**
- * {{@literal @}icu} Returns the functionally equivalent locale for the given
+ * <strong>[icu]</strong> Returns the functionally equivalent locale for the given
* requested locale, with respect to given keyword, for the
* collation service.
* @param keyword a particular keyword as enumerated by
@@ -1032,7 +1031,7 @@
}
/**
- * {{@literal @}icu} Returns the name of the collator for the objectLocale, localized for the
+ * <strong>[icu]</strong> Returns the name of the collator for the objectLocale, localized for the
* displayLocale.
* @param objectLocale the locale of the collator
* @param displayLocale the locale for the collator's display name
@@ -1044,7 +1043,7 @@
}
/**
- * {{@literal @}icu} Returns the name of the collator for the objectLocale, localized for the
+ * <strong>[icu]</strong> Returns the name of the collator for the objectLocale, localized for the
* displayLocale.
* @param objectLocale the locale of the collator
* @param displayLocale the locale for the collator's display name
@@ -1055,7 +1054,7 @@
}
/**
- * {{@literal @}icu} Returns the name of the collator for the objectLocale, localized for the
+ * <strong>[icu]</strong> Returns the name of the collator for the objectLocale, localized for the
* default <code>DISPLAY</code> locale.
* @param objectLocale the locale of the collator
* @return the display name
@@ -1066,7 +1065,7 @@
}
/**
- * {{@literal @}icu} Returns the name of the collator for the objectLocale, localized for the
+ * <strong>[icu]</strong> Returns the name of the collator for the objectLocale, localized for the
* default <code>DISPLAY</code> locale.
* @param objectLocale the locale of the collator
* @return the display name
@@ -1080,7 +1079,7 @@
* Returns this Collator's strength attribute. The strength attribute
* determines the minimum level of difference considered significant.
* </p>
- * {{@literal @}icunote} This can return QUATERNARY strength, which is not supported by the
+ * <strong>[icu] Note:</strong> This can return QUATERNARY strength, which is not supported by the
* JDK version.
* <p>
* See the Collator class description for more details.
@@ -1139,7 +1138,7 @@
}
/**
- * {{@literal @}icu} Returns a UnicodeSet that contains all the characters and sequences tailored
+ * <strong>[icu]</strong> Returns a UnicodeSet that contains all the characters and sequences tailored
* in this collator.
* @return a pointer to a UnicodeSet object containing all the
* code points and sequences that may sort differently than
@@ -1187,7 +1186,6 @@
* Compares two CharSequences.
* The base class just calls compare(left.toString(), right.toString()).
* Subclasses should instead implement this method and have the String API call this method.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1218,7 +1216,7 @@
public abstract CollationKey getCollationKey(String source);
/**
- * {{@literal @}icu} Returns the simpler form of a CollationKey for the String source following
+ * <strong>[icu]</strong> Returns the simpler form of a CollationKey for the String source following
* the rules of this Collator and stores the result into the user provided argument
* key. If key has a internal byte array of length that's too small for the result,
* the internal byte array will be grown to the exact required size.
@@ -1238,7 +1236,7 @@
RawCollationKey key);
/**
- * {{@literal @}icu} Sets the variable top to the top of the specified reordering group.
+ * <strong>[icu]</strong> Sets the variable top to the top of the specified reordering group.
* The variable top determines the highest-sorting character
* which is affected by the alternate handling behavior.
* If that attribute is set to UCOL_NON_IGNORABLE, then the variable top has no effect.
@@ -1255,7 +1253,7 @@
}
/**
- * {{@literal @}icu} Returns the maximum reordering group whose characters are affected by
+ * <strong>[icu]</strong> Returns the maximum reordering group whose characters are affected by
* the alternate handling behavior.
*
* <p>The base class implementation returns Collator.ReorderCodes.PUNCTUATION.
@@ -1267,7 +1265,7 @@
}
/**
- * {{@literal @}icu} Sets the variable top to the primary weight of the specified string.
+ * <strong>[icu]</strong> Sets the variable top to the primary weight of the specified string.
*
* <p>Beginning with ICU 53, the variable top is pinned to
* the top of one of the supported reordering groups,
@@ -1295,7 +1293,7 @@
public abstract int setVariableTop(String varTop);
/**
- * {{@literal @}icu} Gets the variable top value of a Collator.
+ * <strong>[icu]</strong> Gets the variable top value of a Collator.
*
* @return the variable top primary weight
* @see #getMaxVariable
@@ -1303,7 +1301,7 @@
public abstract int getVariableTop();
/**
- * {{@literal @}icu} Sets the variable top to the specified primary weight.
+ * <strong>[icu]</strong> Sets the variable top to the specified primary weight.
*
* <p>Beginning with ICU 53, the variable top is pinned to
* the top of one of the supported reordering groups,
@@ -1320,13 +1318,13 @@
public abstract void setVariableTop(int varTop);
/**
- * {{@literal @}icu} Returns the version of this collator object.
+ * <strong>[icu]</strong> Returns the version of this collator object.
* @return the version object associated with this collator
*/
public abstract VersionInfo getVersion();
/**
- * {{@literal @}icu} Returns the UCA version of this collator object.
+ * <strong>[icu]</strong> Returns the UCA version of this collator object.
* @return the version object associated with this collator
*/
public abstract VersionInfo getUCAVersion();
@@ -1404,7 +1402,7 @@
// -------- BEGIN ULocale boilerplate --------
/**
- * {{@literal @}icu} Returns the locale that was used to create this object, or null.
+ * <strong>[icu]</strong> Returns the locale that was used to create this object, or null.
* This may may differ from the locale requested at the time of
* this object's creation. For example, if an object is created
* for locale <tt>en_US_CALIFORNIA</tt>, the actual data may be
@@ -1428,8 +1426,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#VALID_LOCALE
* @see android.icu.util.ULocale#ACTUAL_LOCALE
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public ULocale getLocale(ULocale.Type type) {
diff --git a/android_icu4j/src/main/java/android/icu/text/CompactDecimalFormat.java b/android_icu4j/src/main/java/android/icu/text/CompactDecimalFormat.java
index cdf31a7..5da1534 100644
--- a/android_icu4j/src/main/java/android/icu/text/CompactDecimalFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/CompactDecimalFormat.java
@@ -151,7 +151,6 @@
* @param debugCreationErrors
* A collection of strings for debugging. If null on input, then any errors found will be added to that
* collection instead of throwing exceptions.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/CompoundTransliterator.java b/android_icu4j/src/main/java/android/icu/text/CompoundTransliterator.java
index d6d27e1..35a0705 100644
--- a/android_icu4j/src/main/java/android/icu/text/CompoundTransliterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/CompoundTransliterator.java
@@ -306,7 +306,6 @@
}
/**
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
@Override
diff --git a/android_icu4j/src/main/java/android/icu/text/CurrencyDisplayNames.java b/android_icu4j/src/main/java/android/icu/text/CurrencyDisplayNames.java
index 7094a38..ff7b14c 100644
--- a/android_icu4j/src/main/java/android/icu/text/CurrencyDisplayNames.java
+++ b/android_icu4j/src/main/java/android/icu/text/CurrencyDisplayNames.java
@@ -89,7 +89,6 @@
/**
* Returns true if currency display name data is available.
* @return true if currency display name data is available
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -153,7 +152,6 @@
/**
* Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/CurrencyMetaInfo.java b/android_icu4j/src/main/java/android/icu/text/CurrencyMetaInfo.java
index 0428ca9..64082b2 100644
--- a/android_icu4j/src/main/java/android/icu/text/CurrencyMetaInfo.java
+++ b/android_icu4j/src/main/java/android/icu/text/CurrencyMetaInfo.java
@@ -54,7 +54,6 @@
/**
* Returns true if there is data for the currency meta info.
* @return true if there is actual data
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -65,7 +64,6 @@
/**
* Subclass constructor.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -99,7 +97,6 @@
/**
* true if we are filtering only for currencies used as legal tender.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -424,7 +421,6 @@
/**
* Constructs a currency info.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -514,7 +510,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/CurrencyPluralInfo.java b/android_icu4j/src/main/java/android/icu/text/CurrencyPluralInfo.java
index f4605d0..4e77560 100644
--- a/android_icu4j/src/main/java/android/icu/text/CurrencyPluralInfo.java
+++ b/android_icu4j/src/main/java/android/icu/text/CurrencyPluralInfo.java
@@ -206,7 +206,6 @@
/**
* Mock implementation of hashCode(). This implementation always returns a constant
* value. When Java assertion is enabled, this method triggers an assertion failure.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -220,7 +219,6 @@
/**
* Given a number, returns the keyword of the first rule that applies
* to the number.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -232,7 +230,6 @@
/**
* Given a number, returns the keyword of the first rule that applies
* to the number.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/DateFormat.java b/android_icu4j/src/main/java/android/icu/text/DateFormat.java
index 4a8ef82..282846b 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateFormat.java
@@ -31,7 +31,7 @@
import android.icu.util.ULocale.Category;
/**
- * {{@literal @}icuenhanced java.text.DateFormat}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.DateFormat}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>
* DateFormat is an abstract class for date/time formatting subclasses which formats and parses dates or time in a
@@ -212,7 +212,7 @@
public final static int SECOND_FIELD = 7;
/**
- * {{@literal @}icu} FieldPosition selector for 'S' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'S' field alignment,
* corresponding to the {@link Calendar#MILLISECOND} field.
*
* Note: Time formats that use 'S' can display a maximum of three
@@ -290,44 +290,44 @@
public final static int TIMEZONE_FIELD = 17;
/**
- * {{@literal @}icu} FieldPosition selector for 'Y' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'Y' field alignment,
* corresponding to the {@link Calendar#YEAR_WOY} field.
*/
public final static int YEAR_WOY_FIELD = 18;
/**
- * {{@literal @}icu} FieldPosition selector for 'e' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'e' field alignment,
* corresponding to the {@link Calendar#DOW_LOCAL} field.
*/
public final static int DOW_LOCAL_FIELD = 19;
/**
- * {{@literal @}icu} FieldPosition selector for 'u' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'u' field alignment,
* corresponding to the {@link Calendar#EXTENDED_YEAR} field.
*/
public final static int EXTENDED_YEAR_FIELD = 20;
/**
- * {{@literal @}icu} FieldPosition selector for 'g' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'g' field alignment,
* corresponding to the {@link Calendar#JULIAN_DAY} field.
*/
public final static int JULIAN_DAY_FIELD = 21;
/**
- * {{@literal @}icu} FieldPosition selector for 'A' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'A' field alignment,
* corresponding to the {@link Calendar#MILLISECONDS_IN_DAY} field.
*/
public final static int MILLISECONDS_IN_DAY_FIELD = 22;
/**
- * {{@literal @}icu} FieldPosition selector for 'Z' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'Z' field alignment,
* corresponding to the {@link Calendar#ZONE_OFFSET} and
* {@link Calendar#DST_OFFSET} fields.
*/
public final static int TIMEZONE_RFC_FIELD = 23;
/**
- * {{@literal @}icu} FieldPosition selector for 'v' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'v' field alignment,
* corresponding to the {@link Calendar#ZONE_OFFSET} and
* {@link Calendar#DST_OFFSET} fields. This displays the generic zone
* name, if available.
@@ -335,35 +335,35 @@
public final static int TIMEZONE_GENERIC_FIELD = 24;
/**
- * {{@literal @}icu} FieldPosition selector for 'c' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'c' field alignment,
* corresponding to the {@link Calendar#DAY_OF_WEEK} field.
* This displays the stand alone day name, if available.
*/
public final static int STANDALONE_DAY_FIELD = 25;
/**
- * {{@literal @}icu} FieldPosition selector for 'L' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'L' field alignment,
* corresponding to the {@link Calendar#MONTH} field.
* This displays the stand alone month name, if available.
*/
public final static int STANDALONE_MONTH_FIELD = 26;
/**
- * {{@literal @}icu} FieldPosition selector for 'Q' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'Q' field alignment,
* corresponding to the {@link Calendar#MONTH} field.
* This displays the quarter.
*/
public final static int QUARTER_FIELD = 27;
/**
- * {{@literal @}icu} FieldPosition selector for 'q' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'q' field alignment,
* corresponding to the {@link Calendar#MONTH} field.
* This displays the stand alone quarter, if available.
*/
public final static int STANDALONE_QUARTER_FIELD = 28;
/**
- * {{@literal @}icu} FieldPosition selector for 'V' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'V' field alignment,
* corresponding to the {@link Calendar#ZONE_OFFSET} and
* {@link Calendar#DST_OFFSET} fields. This displays the fallback timezone
* name when VVVV is specified, and the short standard or daylight
@@ -372,14 +372,14 @@
public final static int TIMEZONE_SPECIAL_FIELD = 29;
/**
- * {{@literal @}icu} FieldPosition selector for 'U' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'U' field alignment,
* corresponding to the {@link Calendar#YEAR} field.
* This displays the cyclic year name, if available.
*/
public final static int YEAR_NAME_FIELD = 30;
/**
- * {{@literal @}icu} FieldPosition selector for 'O' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'O' field alignment,
* corresponding to the {@link Calendar#ZONE_OFFSET} and
* {@link Calendar#DST_OFFSET} fields. This displays the
* localized GMT format.
@@ -387,7 +387,7 @@
public final static int TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31;
/**
- * {{@literal @}icu} FieldPosition selector for 'X' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'X' field alignment,
* corresponding to the {@link Calendar#ZONE_OFFSET} and
* {@link Calendar#DST_OFFSET} fields. This displays the
* ISO 8601 local time offset format or UTC indicator ("Z").
@@ -395,7 +395,7 @@
public final static int TIMEZONE_ISO_FIELD = 32;
/**
- * {{@literal @}icu} FieldPosition selector for 'x' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'x' field alignment,
* corresponding to the {@link Calendar#ZONE_OFFSET} and
* {@link Calendar#DST_OFFSET} fields. This displays the
* ISO 8601 local time offset format.
@@ -403,11 +403,10 @@
public final static int TIMEZONE_ISO_LOCAL_FIELD = 33;
/**
- * {{@literal @}icu} FieldPosition selector for 'r' field alignment,
+ * <strong>[icu]</strong> FieldPosition selector for 'r' field alignment,
* corresponding to the {@link Calendar#EXTENDED_YEAR} field
* of the *related* calendar which may be different than the
* one used by the DateFormat.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -415,17 +414,15 @@
final static int RELATED_YEAR = 34;
/**
- * {{@literal @}icu} FieldPosition selector time separator,
+ * <strong>[icu]</strong> FieldPosition selector time separator,
* no related Calendar field. No pattern character is currently
* defined for this.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final static int TIME_SEPARATOR = 35;
/**
- * {{@literal @}icu} Number of FieldPosition selectors for DateFormat.
+ * <strong>[icu]</strong> Number of FieldPosition selectors for DateFormat.
* Valid selectors range from 0 to FIELD_COUNT-1.
*/
@@ -454,22 +451,17 @@
/**
* indicates tolerance of pattern mismatch between input data and specified format pattern.
* e.g. accepting "September" for a month pattern of MMM ("Sep")
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
PARSE_MULTIPLE_PATTERNS_FOR_MATCH,
/**
* indicates tolerance of a partial literal match
* e.g. accepting "--mon-02-march-2011" for a pattern of "'--: 'EEE-WW-MMMM-yyyy"
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
PARSE_PARTIAL_LITERAL_MATCH,
/**
* alias of PARSE_PARTIAL_LITERAL_MATCH
- * {@literal @}internal
* @deprecated
* @hide draft / provisional / internal are hidden on Android
*/
@@ -768,7 +760,7 @@
}
/**
- * {{@literal @}icu} Constant for empty style pattern.
+ * <strong>[icu]</strong> Constant for empty style pattern.
*/
public static final int NONE = -1;
@@ -798,32 +790,32 @@
public static final int DEFAULT = MEDIUM;
/**
- * {{@literal @}icu} Constant for relative style mask.
+ * <strong>[icu]</strong> Constant for relative style mask.
*/
public static final int RELATIVE = (1 << 7);
/**
- * {{@literal @}icu} Constant for relative full style pattern.
+ * <strong>[icu]</strong> Constant for relative full style pattern.
*/
public static final int RELATIVE_FULL = RELATIVE | FULL;
/**
- * {{@literal @}icu} Constant for relative style pattern.
+ * <strong>[icu]</strong> Constant for relative style pattern.
*/
public static final int RELATIVE_LONG = RELATIVE | LONG;
/**
- * {{@literal @}icu} Constant for relative style pattern.
+ * <strong>[icu]</strong> Constant for relative style pattern.
*/
public static final int RELATIVE_MEDIUM = RELATIVE | MEDIUM;
/**
- * {{@literal @}icu} Constant for relative style pattern.
+ * <strong>[icu]</strong> Constant for relative style pattern.
*/
public static final int RELATIVE_SHORT = RELATIVE | SHORT;
/**
- * {{@literal @}icu} Constant for relative default style pattern.
+ * <strong>[icu]</strong> Constant for relative default style pattern.
*/
public static final int RELATIVE_DEFAULT = RELATIVE | DEFAULT;
@@ -832,143 +824,143 @@
*/
/**
- * {{@literal @}icu} Constant for date skeleton with year.
+ * <strong>[icu]</strong> Constant for date skeleton with year.
*/
public static final String YEAR = "y";
/**
- * {{@literal @}icu} Constant for date skeleton with quarter.
+ * <strong>[icu]</strong> Constant for date skeleton with quarter.
*/
public static final String QUARTER = "QQQQ";
/**
- * {{@literal @}icu} Constant for date skeleton with abbreviated quarter.
+ * <strong>[icu]</strong> Constant for date skeleton with abbreviated quarter.
*/
public static final String ABBR_QUARTER = "QQQ";
/**
- * {{@literal @}icu} Constant for date skeleton with year and quarter.
+ * <strong>[icu]</strong> Constant for date skeleton with year and quarter.
*/
public static final String YEAR_QUARTER = "yQQQQ";
/**
- * {{@literal @}icu} Constant for date skeleton with year and abbreviated quarter.
+ * <strong>[icu]</strong> Constant for date skeleton with year and abbreviated quarter.
*/
public static final String YEAR_ABBR_QUARTER = "yQQQ";
/**
- * {{@literal @}icu} Constant for date skeleton with month.
+ * <strong>[icu]</strong> Constant for date skeleton with month.
*/
public static final String MONTH = "MMMM";
/**
- * {{@literal @}icu} Constant for date skeleton with abbreviated month.
+ * <strong>[icu]</strong> Constant for date skeleton with abbreviated month.
*/
public static final String ABBR_MONTH = "MMM";
/**
- * {{@literal @}icu} Constant for date skeleton with numeric month.
+ * <strong>[icu]</strong> Constant for date skeleton with numeric month.
*/
public static final String NUM_MONTH = "M";
/**
- * {{@literal @}icu} Constant for date skeleton with year and month.
+ * <strong>[icu]</strong> Constant for date skeleton with year and month.
*/
public static final String YEAR_MONTH = "yMMMM";
/**
- * {{@literal @}icu} Constant for date skeleton with year and abbreviated month.
+ * <strong>[icu]</strong> Constant for date skeleton with year and abbreviated month.
*/
public static final String YEAR_ABBR_MONTH = "yMMM";
/**
- * {{@literal @}icu} Constant for date skeleton with year and numeric month.
+ * <strong>[icu]</strong> Constant for date skeleton with year and numeric month.
*/
public static final String YEAR_NUM_MONTH = "yM";
/**
- * {{@literal @}icu} Constant for date skeleton with day.
+ * <strong>[icu]</strong> Constant for date skeleton with day.
*/
public static final String DAY = "d";
/**
- * {{@literal @}icu} Constant for date skeleton with year, month, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with year, month, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String YEAR_MONTH_DAY = "yMMMMd";
/**
- * {{@literal @}icu} Constant for date skeleton with year, abbreviated month, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with year, abbreviated month, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String YEAR_ABBR_MONTH_DAY = "yMMMd";
/**
- * {{@literal @}icu} Constant for date skeleton with year, numeric month, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with year, numeric month, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String YEAR_NUM_MONTH_DAY = "yMd";
/**
- * {{@literal @}icu} Constant for date skeleton with weekday.
+ * <strong>[icu]</strong> Constant for date skeleton with weekday.
*/
public static final String WEEKDAY = "EEEE";
/**
- * {{@literal @}icu} Constant for date skeleton with abbreviated weekday.
+ * <strong>[icu]</strong> Constant for date skeleton with abbreviated weekday.
*/
public static final String ABBR_WEEKDAY = "E";
/**
- * {{@literal @}icu} Constant for date skeleton with year, month, weekday, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with year, month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String YEAR_MONTH_WEEKDAY_DAY = "yMMMMEEEEd";
/**
- * {{@literal @}icu} Constant for date skeleton with year, abbreviated month, weekday, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with year, abbreviated month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String YEAR_ABBR_MONTH_WEEKDAY_DAY = "yMMMEd";
/**
- * {{@literal @}icu} Constant for date skeleton with year, numeric month, weekday, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with year, numeric month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String YEAR_NUM_MONTH_WEEKDAY_DAY = "yMEd";
/**
- * {{@literal @}icu} Constant for date skeleton with long month and day.
+ * <strong>[icu]</strong> Constant for date skeleton with long month and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String MONTH_DAY = "MMMMd";
/**
- * {{@literal @}icu} Constant for date skeleton with abbreviated month and day.
+ * <strong>[icu]</strong> Constant for date skeleton with abbreviated month and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String ABBR_MONTH_DAY = "MMMd";
/**
- * {{@literal @}icu} Constant for date skeleton with numeric month and day.
+ * <strong>[icu]</strong> Constant for date skeleton with numeric month and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String NUM_MONTH_DAY = "Md";
/**
- * {{@literal @}icu} Constant for date skeleton with month, weekday, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String MONTH_WEEKDAY_DAY = "MMMMEEEEd";
/**
- * {{@literal @}icu} Constant for date skeleton with abbreviated month, weekday, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with abbreviated month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String ABBR_MONTH_WEEKDAY_DAY = "MMMEd";
/**
- * {{@literal @}icu} Constant for date skeleton with numeric month, weekday, and day.
+ * <strong>[icu]</strong> Constant for date skeleton with numeric month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String NUM_MONTH_WEEKDAY_DAY = "MEd";
@@ -976,7 +968,6 @@
/**
* List of all of the date skeleton constants for iteration.
* Note that this is fragile; be sure to add any values that are added above.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1015,53 +1006,53 @@
*/
/**
- * {{@literal @}icu} Constant for date skeleton with hour, with the locale's preferred hour format (12 or 24).
+ * <strong>[icu]</strong> Constant for date skeleton with hour, with the locale's preferred hour format (12 or 24).
*/
public static final String HOUR = "j";
/**
- * {{@literal @}icu} Constant for date skeleton with hour in 24-hour presentation.
+ * <strong>[icu]</strong> Constant for date skeleton with hour in 24-hour presentation.
*/
public static final String HOUR24 = "H";
/**
- * {{@literal @}icu} Constant for date skeleton with minute.
+ * <strong>[icu]</strong> Constant for date skeleton with minute.
*/
public static final String MINUTE = "m";
/**
- * {{@literal @}icu} Constant for date skeleton with hour and minute, with the locale's preferred hour format (12 or 24).
+ * <strong>[icu]</strong> Constant for date skeleton with hour and minute, with the locale's preferred hour format (12 or 24).
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String HOUR_MINUTE = "jm";
/**
- * {{@literal @}icu} Constant for date skeleton with hour and minute in 24-hour presentation.
+ * <strong>[icu]</strong> Constant for date skeleton with hour and minute in 24-hour presentation.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String HOUR24_MINUTE = "Hm";
/**
- * {{@literal @}icu} Constant for date skeleton with second.
+ * <strong>[icu]</strong> Constant for date skeleton with second.
*/
public static final String SECOND = "s";
/**
- * {{@literal @}icu} Constant for date skeleton with hour, minute, and second,
+ * <strong>[icu]</strong> Constant for date skeleton with hour, minute, and second,
* with the locale's preferred hour format (12 or 24).
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String HOUR_MINUTE_SECOND = "jms";
/**
- * {{@literal @}icu} Constant for date skeleton with hour, minute, and second in
+ * <strong>[icu]</strong> Constant for date skeleton with hour, minute, and second in
* 24-hour presentation.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String HOUR24_MINUTE_SECOND = "Hms";
/**
- * {{@literal @}icu} Constant for date skeleton with minute and second.
+ * <strong>[icu]</strong> Constant for date skeleton with minute and second.
* Used in combinations date + time, date + time + zone, or time + zone.
*/
public static final String MINUTE_SECOND = "ms";
@@ -1069,7 +1060,6 @@
/**
* List of all of the time skeleton constants for iteration.
* Note that this is fragile; be sure to add any values that are added above.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1091,7 +1081,7 @@
*/
/**
- * {{@literal @}icu} Constant for <i>generic location format</i>, such as Los Angeles Time;
+ * <strong>[icu]</strong> Constant for <i>generic location format</i>, such as Los Angeles Time;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
@@ -1099,7 +1089,7 @@
public static final String LOCATION_TZ = "VVVV";
/**
- * {{@literal @}icu} Constant for <i>generic non-location format</i>, such as Pacific Time;
+ * <strong>[icu]</strong> Constant for <i>generic non-location format</i>, such as Pacific Time;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
@@ -1107,7 +1097,7 @@
public static final String GENERIC_TZ = "vvvv";
/**
- * {{@literal @}icu} Constant for <i>generic non-location format</i>, abbreviated if possible, such as PT;
+ * <strong>[icu]</strong> Constant for <i>generic non-location format</i>, abbreviated if possible, such as PT;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
@@ -1115,7 +1105,7 @@
public static final String ABBR_GENERIC_TZ = "v";
/**
- * {{@literal @}icu} Constant for <i>specific non-location format</i>, such as Pacific Daylight Time;
+ * <strong>[icu]</strong> Constant for <i>specific non-location format</i>, such as Pacific Daylight Time;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
@@ -1123,7 +1113,7 @@
public static final String SPECIFIC_TZ = "zzzz";
/**
- * {{@literal @}icu} Constant for <i>specific non-location format</i>, abbreviated if possible, such as PDT;
+ * <strong>[icu]</strong> Constant for <i>specific non-location format</i>, abbreviated if possible, such as PDT;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
@@ -1131,7 +1121,7 @@
public static final String ABBR_SPECIFIC_TZ = "z";
/**
- * {{@literal @}icu} Constant for <i>localized GMT/UTC format</i>, such as GMT+8:00 or HPG-8:00;
+ * <strong>[icu]</strong> Constant for <i>localized GMT/UTC format</i>, such as GMT+8:00 or HPG-8:00;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
@@ -1141,7 +1131,6 @@
/**
* List of all of the zone skeleton constants for iteration.
* Note that this is fragile; be sure to add any values that are added above.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1160,7 +1149,7 @@
*/
/**
- * {{@literal @}icu} Constant for date skeleton with standalone month.
+ * <strong>[icu]</strong> Constant for date skeleton with standalone month.
* @deprecated ICU 50 Use {@link #MONTH} instead.
* @hide original deprecated method
*/
@@ -1168,7 +1157,7 @@
public static final String STANDALONE_MONTH = "LLLL";
/**
- * {{@literal @}icu} Constant for date skeleton with standalone abbreviated month.
+ * <strong>[icu]</strong> Constant for date skeleton with standalone abbreviated month.
* @deprecated ICU 50 Use {@link #ABBR_MONTH} instead.
* @hide original deprecated method
*/
@@ -1176,7 +1165,7 @@
public static final String ABBR_STANDALONE_MONTH = "LLL";
/**
- * {{@literal @}icu} Constant for date skeleton with hour, minute, and generic timezone.
+ * <strong>[icu]</strong> Constant for date skeleton with hour, minute, and generic timezone.
* @deprecated ICU 50 Use instead {@link #HOUR_MINUTE}+{@link #ABBR_GENERIC_TZ} or some other timezone presentation.
* @hide original deprecated method
*/
@@ -1184,7 +1173,7 @@
public static final String HOUR_MINUTE_GENERIC_TZ = "jmv";
/**
- * {{@literal @}icu} Constant for date skeleton with hour, minute, and timezone.
+ * <strong>[icu]</strong> Constant for date skeleton with hour, minute, and timezone.
* @deprecated ICU 50 Use instead {@link #HOUR_MINUTE}+{@link #ABBR_SPECIFIC_TZ} or some other timezone presentation.
* @hide original deprecated method
*/
@@ -1192,7 +1181,7 @@
public static final String HOUR_MINUTE_TZ = "jmz";
/**
- * {{@literal @}icu} Constant for date skeleton with hour and generic timezone.
+ * <strong>[icu]</strong> Constant for date skeleton with hour and generic timezone.
* @deprecated ICU 50 Use instead {@link #HOUR}+{@link #ABBR_GENERIC_TZ} or some other timezone presentation.
* @hide original deprecated method
*/
@@ -1200,7 +1189,7 @@
public static final String HOUR_GENERIC_TZ = "jv";
/**
- * {{@literal @}icu} Constant for date skeleton with hour and timezone.
+ * <strong>[icu]</strong> Constant for date skeleton with hour and timezone.
* @deprecated ICU 50 Use instead {@link #HOUR}+{@link #ABBR_SPECIFIC_TZ} or some other timezone presentation.
* @hide original deprecated method
*/
@@ -1415,10 +1404,8 @@
}
/**
- * {{@literal @}icu} Returns the set of locales for which DateFormats are installed.
+ * <strong>[icu]</strong> Returns the set of locales for which DateFormats are installed.
* @return the set of locales for which DateFormats are installed.
- * {@literal @}draft ICU 3.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale[] getAvailableULocales()
@@ -1587,7 +1574,7 @@
/**
- * {{@literal @}icu} Set a particular DisplayContext value in the formatter,
+ * <strong>[icu]</strong> Set a particular DisplayContext value in the formatter,
* such as CAPITALIZATION_FOR_STANDALONE.
*
* @param context The DisplayContext value to set.
@@ -1599,7 +1586,7 @@
}
/**
- * {{@literal @}icu} Get the formatter's DisplayContext value for the specified DisplayContext.Type,
+ * <strong>[icu]</strong> Get the formatter's DisplayContext value for the specified DisplayContext.Type,
* such as CAPITALIZATION.
*
* @param type the DisplayContext.Type whose value to return
@@ -1879,7 +1866,6 @@
*
* @param cal The calendar system for which a date/time format is desired.
* @param locale The locale for which the date/time format is desired.
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static final public DateFormat getInstance(Calendar cal, ULocale locale) {
@@ -1953,7 +1939,7 @@
}
/**
- * {{@literal @}icu} Returns a {@link DateFormat} object that can be used to format dates and times in
+ * <strong>[icu]</strong> Returns a {@link DateFormat} object that can be used to format dates and times in
* the default locale.
*
* @param skeleton The skeleton that selects the fields to be formatted. (Uses the
@@ -1965,7 +1951,7 @@
}
/**
- * {{@literal @}icu} Returns a {@link DateFormat} object that can be used to format dates and times in
+ * <strong>[icu]</strong> Returns a {@link DateFormat} object that can be used to format dates and times in
* the given locale.
*
* @param skeleton The skeleton that selects the fields to be formatted. (Uses the
@@ -1979,7 +1965,7 @@
}
/**
- * {{@literal @}icu} Returns a {@link DateFormat} object that can be used to format dates and times in
+ * <strong>[icu]</strong> Returns a {@link DateFormat} object that can be used to format dates and times in
* the given locale.
*
* @param skeleton The skeleton that selects the fields to be formatted. (Uses the
@@ -1995,7 +1981,7 @@
}
/**
- * {{@literal @}icu} Creates a {@link DateFormat} object that can be used to format dates and
+ * <strong>[icu]</strong> Creates a {@link DateFormat} object that can be used to format dates and
* times in the calendar system specified by <code>cal</code>.
*
* @param cal The calendar system for which a date/time format is desired.
@@ -2012,7 +1998,7 @@
}
/**
- * {{@literal @}icu} Creates a {@link DateFormat} object that can be used to format dates and
+ * <strong>[icu]</strong> Creates a {@link DateFormat} object that can be used to format dates and
* times in the calendar system specified by <code>cal</code>.
*
* @param cal The calendar system for which a date/time format is desired.
@@ -2035,7 +2021,7 @@
/**
- * {{@literal @}icu} Returns a {@link DateFormat} object that can be used to format dates and times in
+ * <strong>[icu]</strong> Returns a {@link DateFormat} object that can be used to format dates and times in
* the default locale.
* The getInstanceForSkeleton methods are preferred over the getPatternInstance methods.
*
@@ -2048,7 +2034,7 @@
}
/**
- * {{@literal @}icu} Returns a {@link DateFormat} object that can be used to format dates and times in
+ * <strong>[icu]</strong> Returns a {@link DateFormat} object that can be used to format dates and times in
* the given locale.
* The getInstanceForSkeleton methods are preferred over the getPatternInstance methods.
*
@@ -2063,7 +2049,7 @@
}
/**
- * {{@literal @}icu} Returns a {@link DateFormat} object that can be used to format dates and times in
+ * <strong>[icu]</strong> Returns a {@link DateFormat} object that can be used to format dates and times in
* the given locale.
* The getInstanceForSkeleton methods are preferred over the getPatternInstance methods.
*
@@ -2078,7 +2064,7 @@
}
/**
- * {{@literal @}icu} Creates a {@link DateFormat} object that can be used to format dates and
+ * <strong>[icu]</strong> Creates a {@link DateFormat} object that can be used to format dates and
* times in the calendar system specified by <code>cal</code>.
* The getInstanceForSkeleton methods are preferred over the getPatternInstance methods.
*
@@ -2096,7 +2082,7 @@
}
/**
- * {{@literal @}icu} Creates a {@link DateFormat} object that can be used to format dates and
+ * <strong>[icu]</strong> Creates a {@link DateFormat} object that can be used to format dates and
* times in the calendar system specified by <code>cal</code>.
* The getInstanceForSkeleton methods are preferred over the getPatternInstance methods.
*
@@ -2274,7 +2260,6 @@
/**
* Constant identifying the related year field.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -2283,8 +2268,6 @@
/**
* Constant identifying the time separator field.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final Field TIME_SEPARATOR = new Field("time separator", -1);
diff --git a/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java b/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java
index 99713b8..13b05d4 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateFormatSymbols.java
@@ -33,7 +33,7 @@
import android.icu.util.UResourceBundleIterator;
/**
- * {{@literal @}icuenhanced java.text.DateFormatSymbols}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.DateFormatSymbols}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p><code>DateFormatSymbols</code> is a public class for encapsulating
* localizable date-time formatting data, such as the names of the
@@ -85,19 +85,18 @@
// Constants for context
/**
- * {{@literal @}icu} Constant for context.
+ * <strong>[icu]</strong> Constant for context.
*/
public static final int FORMAT = 0;
/**
- * {{@literal @}icu} Constant for context.
+ * <strong>[icu]</strong> Constant for context.
*/
public static final int STANDALONE = 1;
/**
- * {{@literal @}icu} Constant for context. NUMERIC context
+ * <strong>[icu]</strong> Constant for context. NUMERIC context
* is only supported for leapMonthPatterns.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -106,8 +105,7 @@
public static final int NUMERIC = 2;
/**
- * {{@literal @}icu} Constant for context.
- * {@literal @}internal
+ * <strong>[icu]</strong> Constant for context.
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -118,28 +116,27 @@
// Constants for width
/**
- * {{@literal @}icu} Constant for width.
+ * <strong>[icu]</strong> Constant for width.
*/
public static final int ABBREVIATED = 0;
/**
- * {{@literal @}icu} Constant for width.
+ * <strong>[icu]</strong> Constant for width.
*/
public static final int WIDE = 1;
/**
- * {{@literal @}icu} Constant for width.
+ * <strong>[icu]</strong> Constant for width.
*/
public static final int NARROW = 2;
/**
- * {{@literal @}icu} Constant for width; only supported for weekdays.
+ * <strong>[icu]</strong> Constant for width; only supported for weekdays.
*/
public static final int SHORT = 3;
/**
- * {{@literal @}icu} Constant for width.
- * {@literal @}internal
+ * <strong>[icu]</strong> Constant for width.
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -148,72 +145,62 @@
public static final int DT_WIDTH_COUNT = 4;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_FORMAT_WIDE = 0;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_FORMAT_ABBREV = 1;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_FORMAT_NARROW = 2;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_STANDALONE_WIDE = 3;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_STANDALONE_ABBREV = 4;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_STANDALONE_NARROW = 5;
/**
- * {{@literal @}icu} Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for leap month pattern type, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_LEAP_MONTH_PATTERN_NUMERIC = 6;
/**
- * {{@literal @}icu} Somewhat temporary constant for month pattern count, adequate for Chinese calendar.
- * {@literal @}internal
+ * <strong>[icu]</strong> Somewhat temporary constant for month pattern count, adequate for Chinese calendar.
* @hide draft / provisional / internal are hidden on Android
*/
static final int DT_MONTH_PATTERN_COUNT = 7;
/**
- * {{@literal @}icu} This default time separator is used for formatting when the locale
+ * <strong>[icu]</strong> This default time separator is used for formatting when the locale
* doesn't specify any time separator, and always recognized when parsing.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
static final String DEFAULT_TIME_SEPARATOR = ":";
/**
- * {{@literal @}icu} This alternate time separator is always recognized when parsing.
- * {@literal @}internal
+ * <strong>[icu]</strong> This alternate time separator is always recognized when parsing.
* @hide draft / provisional / internal are hidden on Android
*/
static final String ALTERNATE_TIME_SEPARATOR = ".";
@@ -244,7 +231,7 @@
}
/**
- * {{@literal @}icu} Constructs a DateFormatSymbols object by loading format data from
+ * <strong>[icu]</strong> Constructs a DateFormatSymbols object by loading format data from
* resources for the given ulocale.
*
* @throws java.util.MissingResourceException if the resources for the specified
@@ -258,7 +245,7 @@
/**
* Returns a DateFormatSymbols instance for the default locale.
*
- * {{@literal @}icunote} Unlike <code>java.text.DateFormatSymbols#getInstance</code>,
+ * <strong>[icu] Note:</strong> Unlike <code>java.text.DateFormatSymbols#getInstance</code>,
* this method simply returns <code>new android.icu.text.DateFormatSymbols()</code>.
* ICU does not support <code>DateFormatSymbolsProvider</code> introduced in Java 6
* or its equivalent implementation for now.
@@ -272,7 +259,7 @@
/**
* Returns a DateFormatSymbols instance for the given locale.
*
- * {{@literal @}icunote} Unlike <code>java.text.DateFormatSymbols#getInstance</code>,
+ * <strong>[icu] Note:</strong> Unlike <code>java.text.DateFormatSymbols#getInstance</code>,
* this method simply returns <code>new android.icu.text.DateFormatSymbols(locale)</code>.
* ICU does not support <code>DateFormatSymbolsProvider</code> introduced in Java 6
* or its equivalent implementation for now.
@@ -285,9 +272,9 @@
}
/**
- * {{@literal @}icu} Returns a DateFormatSymbols instance for the given locale.
+ * <strong>[icu]</strong> Returns a DateFormatSymbols instance for the given locale.
*
- * {{@literal @}icunote} Unlike <code>java.text.DateFormatSymbols#getInstance</code>,
+ * <strong>[icu] Note:</strong> Unlike <code>java.text.DateFormatSymbols#getInstance</code>,
* this method simply returns <code>new android.icu.text.DateFormatSymbols(locale)</code>.
* ICU does not support <code>DateFormatSymbolsProvider</code> introduced in Java 6
* or its equivalent implementation for now.
@@ -303,7 +290,7 @@
* Returns an array of all locales for which the <code>getInstance</code> methods of
* this class can return localized instances.
*
- * {{@literal @}icunote} Unlike <code>java.text.DateFormatSymbols#getAvailableLocales</code>,
+ * <strong>[icu] Note:</strong> Unlike <code>java.text.DateFormatSymbols#getAvailableLocales</code>,
* this method simply returns the array of <code>Locale</code>s available in this
* class. ICU does not support <code>DateFormatSymbolsProvider</code> introduced in
* Java 6 or its equivalent implementation for now.
@@ -316,18 +303,16 @@
}
/**
- * {{@literal @}icu} Returns an array of all locales for which the <code>getInstance</code>
+ * <strong>[icu]</strong> Returns an array of all locales for which the <code>getInstance</code>
* methods of this class can return localized instances.
*
- * {{@literal @}icunote} Unlike <code>java.text.DateFormatSymbols#getAvailableLocales</code>,
+ * <strong>[icu] Note:</strong> Unlike <code>java.text.DateFormatSymbols#getAvailableLocales</code>,
* this method simply returns the array of <code>ULocale</code>s available in this
* class. ICU does not support <code>DateFormatSymbolsProvider</code> introduced in
* Java 6 or its equivalent implementation for now.
*
* @return An array of <code>ULocale</code>s for which localized
* <code>DateFormatSymbols</code> instances are available.
- * {@literal @}draft ICU 3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale[] getAvailableULocales() {
@@ -629,9 +614,8 @@
};
/**
- * {{@literal @}icu} Constants for capitalization context usage types
+ * <strong>[icu]</strong> Constants for capitalization context usage types
* related to date formatting.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
enum CapitalizationContextUsage {
@@ -696,7 +680,7 @@
}
/**
- * {{@literal @}icu} Returns era name strings. For example: "Anno Domini" and "Before Christ".
+ * <strong>[icu]</strong> Returns era name strings. For example: "Anno Domini" and "Before Christ".
* @return the era strings.
*/
public String[] getEraNames() {
@@ -704,7 +688,7 @@
}
/**
- * {{@literal @}icu} Sets era name strings. For example: "Anno Domini" and "Before Christ".
+ * <strong>[icu]</strong> Sets era name strings. For example: "Anno Domini" and "Before Christ".
* @param newEraNames the new era strings.
*/
public void setEraNames(String[] newEraNames) {
@@ -966,7 +950,7 @@
shortWeekdays = duplicate(newAbbrevWeekdays);
}
/**
- * {{@literal @}icu} Returns quarter strings. For example: "1st Quarter", "2nd Quarter", etc.
+ * <strong>[icu]</strong> Returns quarter strings. For example: "1st Quarter", "2nd Quarter", etc.
* @param context The quarter context, FORMAT or STANDALONE.
* @param width The width or the returned quarter string,
* either WIDE or ABBREVIATED. There are no NARROW quarters.
@@ -1012,7 +996,7 @@
}
/**
- * {{@literal @}icu} Sets quarter strings. For example: "1st Quarter", "2nd Quarter", etc.
+ * <strong>[icu]</strong> Sets quarter strings. For example: "1st Quarter", "2nd Quarter", etc.
* @param newQuarters the new quarter strings.
* @param context The formatting context, FORMAT or STANDALONE.
* @param width The width of the quarter string,
@@ -1116,7 +1100,6 @@
* @param width The requested pattern width: WIDE, ABBREVIATED, SHORT, NARROW.
* @return The leapMonthPattern, or null if not available for
* this calendar.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1171,7 +1154,6 @@
* @param leapMonthPattern The new leapMonthPattern.
* @param context The usage context: FORMAT, STANDALONE, NUMERIC.
* @param width The name width: WIDE, ABBREVIATED, NARROW.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1242,8 +1224,6 @@
/**
* Returns the time separator string. For example: ":".
* @return the time separator string.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String getTimeSeparatorString() {
@@ -1253,8 +1233,6 @@
/**
* Sets the time separator string. For example: ":".
* @param newTimeSeparator the new time separator string.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public void setTimeSeparatorString(String newTimeSeparator) {
@@ -1501,7 +1479,6 @@
* Initializes format symbols for the locale and calendar type
* @param desiredLocale The locale whose symbols are desired.
* @param calData The calendar resource data
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2025,8 +2002,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#VALID_LOCALE
* @see android.icu.util.ULocale#ACTUAL_LOCALE
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale getLocale(ULocale.Type type) {
diff --git a/android_icu4j/src/main/java/android/icu/text/DateIntervalFormat.java b/android_icu4j/src/main/java/android/icu/text/DateIntervalFormat.java
index eca9912..db3c778 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateIntervalFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateIntervalFormat.java
@@ -354,7 +354,6 @@
* @param dtItvInfo the DateIntervalInfo object to be adopted.
* @param simpleDateFormat will be used for formatting
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -622,7 +621,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -918,7 +916,6 @@
* is supported, upon return this param is unchanged.
* @return A newly created Formattable* object, or NULL
* on failure.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1831,7 +1828,6 @@
/**
* Get the internal patterns for the skeleton
- * {@literal @}internal CLDR
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/DateIntervalInfo.java b/android_icu4j/src/main/java/android/icu/text/DateIntervalInfo.java
index a8973c9..6d2a552 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateIntervalInfo.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateIntervalInfo.java
@@ -253,7 +253,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -320,7 +319,6 @@
* and is recommended to be used only for power users who
* wants to create their own interval patterns and use them to create
* date interval formatter.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -702,7 +700,6 @@
* @param laterDateFirst whether the first date in intervalPattern
* is earlier date or later date
* @return pattern info object
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1028,7 +1025,6 @@
}
/**
- * {@literal @}internal CLDR
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1044,7 +1040,6 @@
/**
* Get the internal patterns, with a deep clone for safety.
- * {@literal @}internal CLDR
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java b/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java
index 6bb75a2..73b9857 100644
--- a/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java
+++ b/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java
@@ -99,7 +99,6 @@
* factory method.
* @param uLocale The locale to pass.
* @return A frozen DateTimePatternGenerator.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -249,7 +248,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -260,7 +258,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -342,7 +339,6 @@
}*/
/**
- * {@literal @}internal CLDR
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -501,7 +497,6 @@
* derived (i.e. entries derived from the standard date/time patters for the specified locale).
* 3. When adding the pattern (skeleton2pattern.put, basePattern_pattern.put), we set a field to indicate that the added
* entry had a specified skeleton.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -571,7 +566,6 @@
*
* @param pattern Input pattern, such as "dd/MMM"
* @return skeleton, such as "MMMdd"
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -590,7 +584,6 @@
*
* @param pattern Input pattern, such as "ccc, d LLL"
* @return skeleton, such as "MMMEd"
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -759,7 +752,6 @@
* in internal order, supply a LinkedHashSet. If null, a
* collection is allocated.
* @return the collection with added elements.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -895,7 +887,6 @@
/**
* Option mask for forcing the width of minute field.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -905,7 +896,6 @@
/**
* Option mask for forcing the width of second field.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -984,7 +974,6 @@
*
* @param skeleton The skeleton to determine if it contains a single field.
* @return true or not
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1077,7 +1066,6 @@
* date format fields. For example, "VVVV" is valid while "V4" is not, nor
* is "44".
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1090,7 +1078,6 @@
/**
* Create a variable field: equivalent to VariableField(string,false);
* @param string The string for the variable field.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1104,7 +1091,6 @@
* @param string The string for the variable field
* @param strict If true, then only allows exactly those lengths specified by CLDR for variables. For example, "hh:mm aa" would throw an exception.
* @throws IllegalArgumentException if the variable field is not valid.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1124,7 +1110,6 @@
* MONTH, DAY, WEEK_OF_YEAR, WEEK_OF_MONTH, WEEKDAY, DAY, DAYPERIOD
* (am/pm), HOUR, MINUTE, SECOND,FRACTIONAL_SECOND, ZONE.
* @return main type.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1135,7 +1120,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1151,7 +1135,6 @@
/**
* Check if the type of this variable field is numeric.
* @return true if the type of this variable field is numeric.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1170,7 +1153,6 @@
/**
* Get the string represented by this variable.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1204,7 +1186,6 @@
return false;
}
* </pre>
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1221,7 +1202,6 @@
/**
* Construct an empty date format parser, to which strings and variables can be added with set(...).
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1234,7 +1214,6 @@
* Parses the string into a list of items.
* @param string The string to parse.
* @return this, for chaining
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1249,7 +1228,6 @@
* @param string The string to parse.
* @param strict If true, then only allows exactly those lengths specified by CLDR for variables. For example, "hh:mm aa" would throw an exception.
* @return this, for chaining
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1331,7 +1309,6 @@
* </pre>
* The list is modifiable, so you can add any strings or variables to it, or remove any items.
* @return modifiable list of items.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1343,7 +1320,6 @@
/** Provide display form of formatted input. Each literal string is quoted if necessary.. That is, if the input was "hh':'mm", the result would be "hh:mm", since the ":" doesn't need quoting. See quoteLiteral().
* @return printable output string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1358,7 +1334,6 @@
* @param start item to start from
* @param limit last item +1
* @return printable output string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1381,7 +1356,6 @@
/**
* Returns true if it has a mixture of date and time variable fields: that is, at least one date variable and at least one time variable.
* @return true or false
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1495,7 +1469,6 @@
* Each literal string is quoted as needed. That is, the ' quote marks will only be added if needed. The exact pattern of quoting is not guaranteed, thus " de la " could be quoted as " 'de la' " or as " 'de' 'la' ".
* @param string The string to check.
* @return string with quoted literals
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1520,10 +1493,9 @@
* in these skeletons all fields are normalized to the canonical pattern
* char for those fields - M or L to M, E or c to E, y or U to y, etc. -
* so corresponding fields will sort in the same way for both TreeMaps.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
- * @hide original deprecated method
- * @hide draft / provisional / internal are hidden on Android
+ * @hide original deprecated method
+ * @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
public boolean skeletonsAreSimilar(String id, String skeleton) {
@@ -1831,7 +1803,6 @@
* internal routine
* @param pattern The pattern that is passed.
* @return field value
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java b/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java
index fb5aa7e..16ce715 100644
--- a/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java
@@ -36,7 +36,7 @@
import android.icu.util.ULocale.Category;
/**
- * {{@literal @}icuenhanced java.text.DecimalFormat}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.DecimalFormat}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <code>DecimalFormat</code> is a concrete subclass of {@link NumberFormat} that formats
* decimal numbers. It has a variety of features designed to make it possible to parse and
@@ -937,7 +937,6 @@
* @param number The number to format.
* @return The number rounded to the correct number of significant digits
* with negative sign stripped off.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -966,9 +965,8 @@
*
* @param number The number to format.
* @return True if number is negative.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
- * @hide draft / provisional / internal are hidden on Android
+ * @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
boolean isNumberNegative(double number) {
@@ -3415,7 +3413,7 @@
}
/**
- * {{@literal @}icu} Returns the rounding increment.
+ * <strong>[icu]</strong> Returns the rounding increment.
*
* @return A positive rounding increment, or <code>null</code> if a custom rounding
* increment is not in effect.
@@ -3430,7 +3428,7 @@
}
/**
- * {{@literal @}icu} Sets the rounding increment. In the absence of a rounding increment, numbers
+ * <strong>[icu]</strong> Sets the rounding increment. In the absence of a rounding increment, numbers
* will be rounded to the number of digits displayed.
*
* @param newValue A positive rounding increment, or <code>null</code> or
@@ -3449,7 +3447,7 @@
}
/**
- * {{@literal @}icu} Sets the rounding increment. In the absence of a rounding increment, numbers
+ * <strong>[icu]</strong> Sets the rounding increment. In the absence of a rounding increment, numbers
* will be rounded to the number of digits displayed.
*
* @param newValue A positive rounding increment, or <code>null</code> or
@@ -3473,7 +3471,7 @@
}
/**
- * {{@literal @}icu} Sets the rounding increment. In the absence of a rounding increment, numbers
+ * <strong>[icu]</strong> Sets the rounding increment. In the absence of a rounding increment, numbers
* will be rounded to the number of digits displayed.
*
* @param newValue A positive rounding increment, or 0.0 to use the default
@@ -3571,7 +3569,7 @@
}
/**
- * {{@literal @}icu} Returns the character used to pad to the format width. The default is ' '.
+ * <strong>[icu]</strong> Returns the character used to pad to the format width. The default is ' '.
*
* @return the pad character
* @see #setFormatWidth
@@ -3585,7 +3583,7 @@
}
/**
- * {{@literal @}icu} Sets the character used to pad to the format width. If padding is not
+ * <strong>[icu]</strong> Sets the character used to pad to the format width. If padding is not
* enabled, then this will take effect if padding is later enabled.
*
* @param padChar the pad character
@@ -3600,7 +3598,7 @@
}
/**
- * {{@literal @}icu} Returns the position at which padding will take place. This is the location at
+ * <strong>[icu]</strong> Returns the position at which padding will take place. This is the location at
* which padding will be inserted if the result of <code>format()</code> is shorter
* than the format width.
*
@@ -3622,7 +3620,7 @@
}
/**
- * {{@literal @}icu} Sets the position at which padding will take place. This is the location at
+ * <strong>[icu]</strong> Sets the position at which padding will take place. This is the location at
* which padding will be inserted if the result of <code>format()</code> is shorter
* than the format width. This has no effect unless padding is enabled.
*
@@ -3648,7 +3646,7 @@
}
/**
- * {{@literal @}icu} Returns whether or not scientific notation is used.
+ * <strong>[icu]</strong> Returns whether or not scientific notation is used.
*
* @return true if this object formats and parses scientific notation
* @see #setScientificNotation
@@ -3662,7 +3660,7 @@
}
/**
- * {{@literal @}icu} Sets whether or not scientific notation is used. When scientific notation is
+ * <strong>[icu]</strong> Sets whether or not scientific notation is used. When scientific notation is
* used, the effective maximum number of integer digits is <= 8. If the maximum number
* of integer digits is set to more than 8, the effective maximum will be 1. This
* allows this call to generate a 'default' scientific number format without
@@ -3680,7 +3678,7 @@
}
/**
- * {{@literal @}icu} Returns the minimum exponent digits that will be shown.
+ * <strong>[icu]</strong> Returns the minimum exponent digits that will be shown.
*
* @return the minimum exponent digits that will be shown
* @see #setScientificNotation
@@ -3694,7 +3692,7 @@
}
/**
- * {{@literal @}icu} Sets the minimum exponent digits that will be shown. This has no effect
+ * <strong>[icu]</strong> Sets the minimum exponent digits that will be shown. This has no effect
* unless scientific notation is in use.
*
* @param minExpDig a value >= 1 indicating the fewest exponent
@@ -3714,7 +3712,7 @@
}
/**
- * {{@literal @}icu} Returns whether the exponent sign is always shown.
+ * <strong>[icu]</strong> Returns whether the exponent sign is always shown.
*
* @return true if the exponent is always prefixed with either the localized minus
* sign or the localized plus sign, false if only negative exponents are prefixed with
@@ -3730,7 +3728,7 @@
}
/**
- * {{@literal @}icu} Sets whether the exponent sign is always shown. This has no effect unless
+ * <strong>[icu]</strong> Sets whether the exponent sign is always shown. This has no effect unless
* scientific notation is in use.
*
* @param expSignAlways true if the exponent is always prefixed with either the
@@ -3773,7 +3771,7 @@
}
/**
- * {{@literal @}icu} Returns the secondary grouping size. In some locales one grouping interval
+ * <strong>[icu]</strong> Returns the secondary grouping size. In some locales one grouping interval
* is used for the least significant integer digits (the primary grouping size), and
* another is used for all others (the secondary grouping size). A formatter
* supporting a secondary grouping size will return a positive integer unequal to the
@@ -3791,7 +3789,7 @@
}
/**
- * {{@literal @}icu} Sets the secondary grouping size. If set to a value less than 1, then
+ * <strong>[icu]</strong> Sets the secondary grouping size. If set to a value less than 1, then
* secondary grouping is turned off, and the primary grouping size is used for all
* intervals, not just the least significant.
*
@@ -3804,7 +3802,7 @@
}
/**
- * {{@literal @}icu} Returns the MathContext used by this format.
+ * <strong>[icu]</strong> Returns the MathContext used by this format.
*
* @return desired MathContext
* @see #getMathContext
@@ -3814,7 +3812,7 @@
}
/**
- * {{@literal @}icu} Returns the MathContext used by this format.
+ * <strong>[icu]</strong> Returns the MathContext used by this format.
*
* @return desired MathContext
* @see #getMathContext
@@ -3830,7 +3828,7 @@
}
/**
- * {{@literal @}icu} Sets the MathContext used by this format.
+ * <strong>[icu]</strong> Sets the MathContext used by this format.
*
* @param newValue desired MathContext
* @see #getMathContext
@@ -3840,7 +3838,7 @@
}
/**
- * {{@literal @}icu} Sets the MathContext used by this format.
+ * <strong>[icu]</strong> Sets the MathContext used by this format.
*
* @param newValue desired MathContext
* @see #getMathContext
@@ -3871,7 +3869,7 @@
}
/**
- * {{@literal @}icu} Returns whether the input to parsing must contain a decimal mark if there
+ * <strong>[icu]</strong> Returns whether the input to parsing must contain a decimal mark if there
* is a decimal mark in the pattern.
* @return true if input must contain a match to decimal mark in pattern
*/
@@ -3897,7 +3895,7 @@
}
/**
- * {{@literal @}icu} Returns a copy of the CurrencyPluralInfo used by this format. It might
+ * <strong>[icu]</strong> Returns a copy of the CurrencyPluralInfo used by this format. It might
* return null if the decimal format is not a plural type currency decimal
* format. Plural type currency decimal format means either the pattern in the decimal
* format contains 3 currency signs, or the decimal format is initialized with
@@ -3917,7 +3915,7 @@
}
/**
- * {{@literal @}icu} Sets the CurrencyPluralInfo used by this format. The format uses a copy of
+ * <strong>[icu]</strong> Sets the CurrencyPluralInfo used by this format. The format uses a copy of
* the provided information.
*
* @param newInfo desired CurrencyPluralInfo
@@ -5225,7 +5223,7 @@
}
/**
- * {{@literal @}icu} Returns the minimum number of significant digits that will be
+ * <strong>[icu]</strong> Returns the minimum number of significant digits that will be
* displayed. This value has no effect unless {@link #areSignificantDigitsUsed()}
* returns true.
*
@@ -5236,7 +5234,7 @@
}
/**
- * {{@literal @}icu} Returns the maximum number of significant digits that will be
+ * <strong>[icu]</strong> Returns the maximum number of significant digits that will be
* displayed. This value has no effect unless {@link #areSignificantDigitsUsed()}
* returns true.
*
@@ -5247,7 +5245,7 @@
}
/**
- * {{@literal @}icu} Sets the minimum number of significant digits that will be displayed. If
+ * <strong>[icu]</strong> Sets the minimum number of significant digits that will be displayed. If
* <code>min</code> is less than one then it is set to one. If the maximum significant
* digits count is less than <code>min</code>, then it is set to <code>min</code>.
* This function also enables the use of significant digits by this formatter -
@@ -5267,7 +5265,7 @@
}
/**
- * {{@literal @}icu} Sets the maximum number of significant digits that will be displayed. If
+ * <strong>[icu]</strong> Sets the maximum number of significant digits that will be displayed. If
* <code>max</code> is less than one then it is set to one. If the minimum significant
* digits count is greater than <code>max</code>, then it is set to <code>max</code>.
* This function also enables the use of significant digits by this formatter -
@@ -5287,7 +5285,7 @@
}
/**
- * {{@literal @}icu} Returns true if significant digits are in use or false if integer and
+ * <strong>[icu]</strong> Returns true if significant digits are in use or false if integer and
* fraction digit counts are in use.
*
* @return true if significant digits are in use
@@ -5297,7 +5295,7 @@
}
/**
- * {{@literal @}icu} Sets whether significant digits are in use, or integer and fraction digit
+ * <strong>[icu]</strong> Sets whether significant digits are in use, or integer and fraction digit
* counts are in use.
*
* @param useSignificantDigits true to use significant digits, or false to use integer
@@ -5379,7 +5377,6 @@
* Returns the currency in effect for this formatter. Subclasses should override this
* method as needed. Unlike getCurrency(), this method should never return null.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -5875,7 +5872,7 @@
// ----------------------------------------------------------------------
/**
- * {{@literal @}icu} Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
+ * <strong>[icu]</strong> Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
* specify pad characters inserted before the prefix.
*
* @see #setPadPosition
@@ -5887,7 +5884,7 @@
public static final int PAD_BEFORE_PREFIX = 0;
/**
- * {{@literal @}icu} Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
+ * <strong>[icu]</strong> Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
* specify pad characters inserted after the prefix.
*
* @see #setPadPosition
@@ -5899,7 +5896,7 @@
public static final int PAD_AFTER_PREFIX = 1;
/**
- * {{@literal @}icu} Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
+ * <strong>[icu]</strong> Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
* specify pad characters inserted before the suffix.
*
* @see #setPadPosition
@@ -5911,7 +5908,7 @@
public static final int PAD_BEFORE_SUFFIX = 2;
/**
- * {{@literal @}icu} Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
+ * <strong>[icu]</strong> Constant for {@link #getPadPosition()} and {@link #setPadPosition(int)} to
* specify pad characters inserted after the suffix.
*
* @see #setPadPosition
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 088a855..a28f7e0 100644
--- a/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
+++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
@@ -29,7 +29,7 @@
import android.icu.util.UResourceBundle;
/**
- * {{@literal @}icuenhanced java.text.DecimalFormatSymbols}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.DecimalFormatSymbols}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* This class represents the set of symbols (such as the decimal separator, the grouping
* separator, and so on) needed by <code>DecimalFormat</code> to format
@@ -62,7 +62,7 @@
}
/**
- * {{@literal @}icu} Creates a DecimalFormatSymbols object for the given locale.
+ * <strong>[icu]</strong> Creates a DecimalFormatSymbols object for the given locale.
* @param locale the locale
*/
public DecimalFormatSymbols(ULocale locale) {
@@ -133,7 +133,7 @@
}
/**
- * {{@literal @}icu} Returns an array of all locales for which the <code>getInstance</code>
+ * <strong>[icu]</strong> Returns an array of all locales for which the <code>getInstance</code>
* methods of this class can return localized instances.
*
* <p><strong>Note:</strong> Unlike
@@ -144,7 +144,6 @@
*
* @return An array of <code>ULocale</code>s for which localized
* <code>DecimalFormatSymbols</code> instances are available.
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale[] getAvailableULocales() {
@@ -379,7 +378,6 @@
/**
* Returns the string used to represent minus sign.
* @return the minus sign string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -476,7 +474,7 @@
}
/**
- * {{@literal @}icu} Returns the monetary grouping separator.
+ * <strong>[icu]</strong> Returns the monetary grouping separator.
* @return the monetary grouping separator character
*/
public char getMonetaryGroupingSeparator() {
@@ -522,7 +520,7 @@
}
/**
- * {{@literal @}icu} Returns the string used to separate the mantissa from the exponent.
+ * <strong>[icu]</strong> Returns the string used to separate the mantissa from the exponent.
* Examples: "x10^" for 1.23x10^4, "E" for 1.23E4.
* @return the localized exponent symbol, used in localized patterns
* and formatted strings
@@ -533,7 +531,7 @@
}
/**
- * {{@literal @}icu} Sets the string used to separate the mantissa from the exponent.
+ * <strong>[icu]</strong> Sets the string used to separate the mantissa from the exponent.
* Examples: "x10^" for 1.23x10^4, "E" for 1.23E4.
* @param exp the localized exponent symbol, used in localized patterns
* and formatted strings
@@ -544,7 +542,7 @@
}
/**
- * {{@literal @}icu} Returns the localized plus sign.
+ * <strong>[icu]</strong> Returns the localized plus sign.
* @return the plus sign, used in localized patterns and formatted
* strings
* @see #setPlusSign
@@ -558,7 +556,6 @@
/**
* Returns the string used to represent plus sign.
* @return the plus sign string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -569,7 +566,7 @@
}
/**
- * {{@literal @}icu} Sets the localized plus sign.
+ * <strong>[icu]</strong> Sets the localized plus sign.
* @param plus the plus sign, used in localized patterns and formatted
* strings
* @see #getPlusSign
@@ -584,7 +581,7 @@
}
/**
- * {{@literal @}icu} Returns the character used to pad numbers out to a specified width. This is
+ * <strong>[icu]</strong> Returns the character used to pad numbers out to a specified width. This is
* not the pad character itself; rather, it is the special pattern character
* <em>preceding</em> the pad character. In the pattern "*_#,##0", '*' is the pad
* escape, and '_' is the pad character.
@@ -599,7 +596,7 @@
}
/**
- * {{@literal @}icu} Sets the character used to pad numbers out to a specified width. This is not
+ * <strong>[icu]</strong> Sets the character used to pad numbers out to a specified width. This is not
* the pad character itself; rather, it is the special pattern character
* <em>preceding</em> the pad character. In the pattern "*_#,##0", '*' is the pad
* escape, and '_' is the pad character.
@@ -613,18 +610,18 @@
}
/**
- * {{@literal @}icu} Indicates the currency match pattern used in {@link #getPatternForCurrencySpacing}.
+ * <strong>[icu]</strong> Indicates the currency match pattern used in {@link #getPatternForCurrencySpacing}.
*/
public static final int CURRENCY_SPC_CURRENCY_MATCH = 0;
/**
- * {{@literal @}icu} Indicates the surrounding match pattern used in {@link
+ * <strong>[icu]</strong> Indicates the surrounding match pattern used in {@link
* #getPatternForCurrencySpacing}.
*/
public static final int CURRENCY_SPC_SURROUNDING_MATCH = 1;
/**
- * {{@literal @}icu} Indicates the insertion value used in {@link #getPatternForCurrencySpacing}.
+ * <strong>[icu]</strong> Indicates the insertion value used in {@link #getPatternForCurrencySpacing}.
*/
public static final int CURRENCY_SPC_INSERT = 2;
@@ -632,7 +629,7 @@
private String[] currencySpcAfterSym;
/**
- * {{@literal @}icu} Returns the desired currency spacing value. Original values come from ICU's
+ * <strong>[icu]</strong> Returns the desired currency spacing value. Original values come from ICU's
* CLDR data based on the locale provided during construction, and can be null. These
* values govern what and when text is inserted between a currency code/name/symbol
* and the currency amount when formatting money.
@@ -661,7 +658,7 @@
}
/**
- * {{@literal @}icu} Sets the indicated currency spacing pattern or value. See {@link
+ * <strong>[icu]</strong> Sets the indicated currency spacing pattern or value. See {@link
* #getPatternForCurrencySpacing} for more information.
*
* <p>Values for currency match and surrounding match must be {@link
@@ -1272,7 +1269,7 @@
// -------- BEGIN ULocale boilerplate --------
/**
- * {{@literal @}icu} Returns the locale that was used to create this object, or null.
+ * <strong>[icu]</strong> Returns the locale that was used to create this object, or null.
* This may may differ from the locale requested at the time of
* this object's creation. For example, if an object is created
* for locale <tt>en_US_CALIFORNIA</tt>, the actual data may be
@@ -1290,8 +1287,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#VALID_LOCALE
* @see android.icu.util.ULocale#ACTUAL_LOCALE
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale getLocale(ULocale.Type type) {
@@ -1300,7 +1295,7 @@
}
/**
- * {{@literal @}icu} Sets information about the locales that were used to create this
+ * <strong>[icu]</strong> Sets information about the locales that were used to create this
* object. If the object was not constructed from locale data,
* both arguments should be set to null. Otherwise, neither
* should be null. The actual locale must be at the same level or
diff --git a/android_icu4j/src/main/java/android/icu/text/DictionaryBreakEngine.java b/android_icu4j/src/main/java/android/icu/text/DictionaryBreakEngine.java
index 85f7d59..9cf639c 100644
--- a/android_icu4j/src/main/java/android/icu/text/DictionaryBreakEngine.java
+++ b/android_icu4j/src/main/java/android/icu/text/DictionaryBreakEngine.java
@@ -86,7 +86,6 @@
* A deque-like structure holding raw ints.
* Partial, limited implementation, only what is needed by the dictionary implementation.
* For internal use only.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
static class DequeI {
diff --git a/android_icu4j/src/main/java/android/icu/text/DurationFormat.java b/android_icu4j/src/main/java/android/icu/text/DurationFormat.java
index 526d869..9b1c958 100644
--- a/android_icu4j/src/main/java/android/icu/text/DurationFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/DurationFormat.java
@@ -44,7 +44,6 @@
/**
* Subclass interface
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -54,7 +53,6 @@
/**
* Subclass interface
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/FilteredBreakIteratorBuilder.java b/android_icu4j/src/main/java/android/icu/text/FilteredBreakIteratorBuilder.java
index d06ffb4..da041ee 100644
--- a/android_icu4j/src/main/java/android/icu/text/FilteredBreakIteratorBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/text/FilteredBreakIteratorBuilder.java
@@ -33,7 +33,6 @@
*
* @author tomzhang
*
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -51,7 +50,6 @@
* of the CLDR exception data.
* @param where the locale.
* @return the new builder
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -65,7 +63,6 @@
* Construct an empty FilteredBreakIteratorBuilder.
* In this state, it will not suppress any segment boundaries.
* @return the new builder
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -82,7 +79,6 @@
* @param str the string to suppress, such as "Mr."
* @return returns true if the string was not present and now added,
* false if the call was a no-op because the string was already being suppressed.
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -97,7 +93,6 @@
* @param str the str the string to unsuppress, such as "Mr."
* @return returns true if the string was present and now removed,
* false if the call was a no-op because the string was not being suppressed.
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -113,7 +108,6 @@
* The FilteredBreakIteratorBuilder may be reused.
* @param adoptBreakIterator the break iterator to adopt
* @return the new BreakIterator, owned by the caller.
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -122,7 +116,6 @@
/**
* For subclass use
- * {@literal @}internal ICU 54 technology preview
* @deprecated This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/IDNA.java b/android_icu4j/src/main/java/android/icu/text/IDNA.java
index 16c8dc2..414d0e0 100644
--- a/android_icu4j/src/main/java/android/icu/text/IDNA.java
+++ b/android_icu4j/src/main/java/android/icu/text/IDNA.java
@@ -254,7 +254,6 @@
// The IDNAInfo also provides intermediate state that is publicly invisible,
// avoiding the allocation of another worker object.
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -264,7 +263,6 @@
info.reset();
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -274,7 +272,6 @@
return !info.errors.isEmpty() && !Collections.disjoint(info.errors, errors);
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -284,7 +281,6 @@
return !info.labelErrors.isEmpty() && !Collections.disjoint(info.labelErrors, errors);
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -294,7 +290,6 @@
info.labelErrors.add(error);
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -307,7 +302,6 @@
}
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -317,7 +311,6 @@
info.errors.add(error);
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -327,7 +320,6 @@
info.isTransDiff=true;
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -337,7 +329,6 @@
info.isBiDi=true;
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -347,7 +338,6 @@
return info.isBiDi;
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -357,7 +347,6 @@
info.isOkBiDi=false;
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -450,7 +439,6 @@
/**
* Sole constructor. (For invocation by subclass constructors, typically implicit.)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/IdentifierInfo.java b/android_icu4j/src/main/java/android/icu/text/IdentifierInfo.java
index 35ebb19..ee1dece 100644
--- a/android_icu4j/src/main/java/android/icu/text/IdentifierInfo.java
+++ b/android_icu4j/src/main/java/android/icu/text/IdentifierInfo.java
@@ -34,7 +34,6 @@
* </ol>
*
* @author markdavis
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -55,7 +54,6 @@
/**
* Create an identifier info object. Subsequently, call {@link #setIdentifier(String)}, etc.
* {@link #setIdentifierProfile(UnicodeSet)}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -77,7 +75,6 @@
*
* @param identifierProfile the characters that are to be allowed in the identifier
* @return self
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -92,7 +89,6 @@
* Get the identifier profile: the characters that are to be allowed in the identifier.
*
* @return The characters that are to be allowed in the identifier.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -107,7 +103,6 @@
*
* @param identifier the identifier to analyze
* @return self
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -178,7 +173,6 @@
* Get the identifier that was analyzed.
*
* @return the identifier that was analyzed.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -191,7 +185,6 @@
* Get the scripts found in the identifiers.
*
* @return the set of explicit scripts.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -205,7 +198,6 @@
* the set consisting of those scripts will be returned.
*
* @return the set of explicit scripts.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -222,7 +214,6 @@
* Get the representative characters (zeros) for the numerics found in the identifier.
*
* @return the set of explicit scripts.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -235,7 +226,6 @@
* Find out which scripts are in common among the alternates.
*
* @return the set of scripts that are in common among the alternates.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -257,7 +247,6 @@
* Find the "tightest" restriction level that the identifier satisfies.
*
* @return the restriction level.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -301,7 +290,6 @@
* The alternate script computation may not be perfect. The distinction
* between 0, 1 and > 1 scripts will be valid, however.
* @return the number of scripts.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -316,7 +304,6 @@
/**
* See Object.toString()
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -345,7 +332,6 @@
*
* @param alternates a set of BitSets of script values.
* @return display form
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -369,7 +355,6 @@
/**
* Order BitSets, first by shortest, then by items.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -395,7 +380,6 @@
*
* @param scripts a BitSet of UScript values
* @return a readable string of a set of scripts
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -416,7 +400,6 @@
*
* @param scriptsString the string to be parsed
* @return BitSet of UScript values.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -436,7 +419,6 @@
*
* @param scriptsSetString a list of alternates, separated by ;
* @return a set of BitSets of UScript values
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -457,7 +439,6 @@
* @param container possible container to be tested
* @param containee possible containee to be tested
* @return true if container contains containee
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -477,7 +458,6 @@
* @param bitset bitset to be affected
* @param values values to be set in the bitset
* @return modified bitset.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/ListFormatter.java b/android_icu4j/src/main/java/android/icu/text/ListFormatter.java
index f9e0aad..64e06e0 100644
--- a/android_icu4j/src/main/java/android/icu/text/ListFormatter.java
+++ b/android_icu4j/src/main/java/android/icu/text/ListFormatter.java
@@ -39,7 +39,6 @@
/**
* Indicates the style of Listformatter
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -47,7 +46,6 @@
public enum Style {
/**
* Standard style.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -55,7 +53,6 @@
STANDARD("standard"),
/**
* Style for full durations
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -63,7 +60,6 @@
DURATION("unit"),
/**
* Style for durations in abbrevated form
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -71,7 +67,6 @@
DURATION_SHORT("unit-short"),
/**
* Style for durations in narrow form
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -84,7 +79,6 @@
this.name = name;
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -111,7 +105,6 @@
* @param end
* string for the end of a list items, containing {0} for the
* first part of the list, and {1} for the last item.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -162,7 +155,6 @@
* @param locale the locale in question.
* @param style the style
* @return ListFormatter
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -245,7 +237,6 @@
/**
* Returns the locale of this object.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/LocaleDisplayNames.java b/android_icu4j/src/main/java/android/icu/text/LocaleDisplayNames.java
index f67c000..ef53aa5 100644
--- a/android_icu4j/src/main/java/android/icu/text/LocaleDisplayNames.java
+++ b/android_icu4j/src/main/java/android/icu/text/LocaleDisplayNames.java
@@ -191,7 +191,6 @@
* when used in the context of a full locale name.
* @param script the script code
* @return the display name of the provided script code
- * {@literal @}internal ICU 49
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -248,8 +247,6 @@
* @param localeSet a list of locales to present in a UI list. The casing uses the settings in the LocaleDisplayNames instance.
* @return an ordered list of UiListItems.
* @throws IllformedLocaleException if any of the locales in localeSet are malformed.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public List<UiListItem> getUiList(Set<ULocale> localeSet, boolean inSelf, Comparator<Object> collator) {
@@ -263,44 +260,32 @@
* @param localeSet a list of locales to present in a UI list. The casing uses the settings in the LocaleDisplayNames instance.
* @return an ordered list of UiListItems.
* @throws IllformedLocaleException if any of the locales in localeSet are malformed.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public abstract List<UiListItem> getUiListCompareWholeItems(Set<ULocale> localeSet, Comparator<UiListItem> comparator);
/**
* Struct-like class used to return information for constructing a UI list, each corresponding to a locale.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static class UiListItem {
/**
* Returns the minimized locale for an input locale, such as sr-Cyrl → sr
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale minimized;
/**
* Returns the modified locale for an input locale, such as sr → sr-Cyrl, where there is also an sr-Latn in the list
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale modified;
/**
* Returns the name of the modified locale in the display locale, such as "Englisch (VS)" (for 'en-US', where the display locale is 'de').
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final String nameInDisplayLocale;
/**
* Returns the name of the modified locale in itself, such as "English (US)" (for 'en-US').
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final String nameInSelf;
@@ -311,8 +296,6 @@
* @param modified modified for an input locale
* @param nameInDisplayLocale name of the modified locale in the display locale
* @param nameInSelf name of the modified locale in itself
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public UiListItem(ULocale minimized, ULocale modified, String nameInDisplayLocale, String nameInSelf) {
@@ -325,8 +308,6 @@
/**
* {@inheritDoc}
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@Override
@@ -341,8 +322,6 @@
/**
* {@inheritDoc}
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@Override
@@ -353,8 +332,6 @@
/**
* {@inheritDoc}
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@Override
@@ -368,8 +345,6 @@
* @param inSelf if true, compares the nameInSelf, otherwise the nameInDisplayLocale
* @param comparator (meant for strings, but because Java Collator doesn't have <String>...)
* @return UiListItem comparator
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static Comparator<UiListItem> getComparator(Comparator<Object> comparator, boolean inSelf) {
@@ -393,7 +368,6 @@
/**
* Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
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 958bfb5..a7bb16a 100644
--- a/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
@@ -329,8 +329,6 @@
* Parses text from a string to produce a <code>Measure</code>.
* @see java.text.Format#parseObject(java.lang.String, java.text.ParsePosition)
* @throws UnsupportedOperationException Not supported.
- * {@literal @}draft ICU 53 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@Override
@@ -368,7 +366,6 @@
* @param lowValue low value in range
* @param highValue high value in range
* @return the formatted string.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -483,8 +480,6 @@
* @param appendTo formatted string appended here.
* @param pos The field position.
* @return appendTo.
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public StringBuilder formatMeasurePerUnit(
@@ -1243,7 +1238,6 @@
* @param forLocale locale to get the format for
* @param width the format width
* @return range formatter, such as "{0}–{1}"
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1291,7 +1285,6 @@
* @param forLocale locale to get the range pattern for
* @param width the format width.
* @return range pattern
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/MessageFormat.java b/android_icu4j/src/main/java/android/icu/text/MessageFormat.java
index 74994a2..df302ca 100644
--- a/android_icu4j/src/main/java/android/icu/text/MessageFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/MessageFormat.java
@@ -44,7 +44,7 @@
import android.icu.util.ULocale.Category;
/**
- * {{@literal @}icuenhanced java.text.MessageFormat}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.MessageFormat}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>MessageFormat prepares strings for display to users,
* with optional arguments (variables/placeholders).
@@ -423,7 +423,7 @@
}
/**
- * {{@literal @}icu} Returns the locale that's used when creating argument Format objects.
+ * <strong>[icu]</strong> Returns the locale that's used when creating argument Format objects.
*
* @return the locale used when creating or comparing subformats
*/
@@ -456,7 +456,7 @@
}
/**
- * {{@literal @}icu} Sets the ApostropheMode and the pattern used by this message format.
+ * <strong>[icu]</strong> Sets the ApostropheMode and the pattern used by this message format.
* Parses the pattern and caches Format objects for simple argument types.
* Patterns and their interpretation are specified in the
* <a href="#patterns">class description</a>.
@@ -479,7 +479,7 @@
}
/**
- * {{@literal @}icu}
+ * <strong>[icu]</strong>
* @return this instance's ApostropheMode.
*/
public MessagePattern.ApostropheMode getApostropheMode() {
@@ -590,7 +590,7 @@
}
/**
- * {{@literal @}icu} Sets the Format objects to use for the values passed into
+ * <strong>[icu]</strong> Sets the Format objects to use for the values passed into
* <code>format</code> methods or returned from <code>parse</code>
* methods. The keys in <code>newFormats</code> are the argument
* names in the previously set pattern string, and the values
@@ -685,7 +685,7 @@
}
/**
- * {{@literal @}icu} Sets the Format object to use for the format elements within the
+ * <strong>[icu]</strong> Sets the Format object to use for the format elements within the
* previously set pattern string that use the given argument
* name.
* <p>
@@ -812,7 +812,7 @@
}
/**
- * {{@literal @}icu} Returns the top-level argument names. For more details, see
+ * <strong>[icu]</strong> Returns the top-level argument names. For more details, see
* {@link #setFormatByArgumentName(String, Format)}.
* @return a Set of argument names
*/
@@ -825,7 +825,7 @@
}
/**
- * {{@literal @}icu} Returns the first top-level format associated with the given argument name.
+ * <strong>[icu]</strong> Returns the first top-level format associated with the given argument name.
* For more details, see {@link #setFormatByArgumentName(String, Format)}.
* @param argumentName The name of the desired argument.
* @return the Format associated with the name, or null if there isn't one.
@@ -993,7 +993,7 @@
}
/**
- * {{@literal @}icu} Returns true if this MessageFormat uses named arguments,
+ * <strong>[icu]</strong> Returns true if this MessageFormat uses named arguments,
* and false otherwise. See class description.
*
* @return true if named arguments are used.
@@ -1140,7 +1140,7 @@
}
/**
- * {{@literal @}icu} Parses the string, returning the results in a Map.
+ * <strong>[icu]</strong> Parses the string, returning the results in a Map.
* This is similar to the version that returns an array
* of Object. This supports both named and numbered
* arguments-- if numbered, the keys in the map are the
@@ -1323,7 +1323,7 @@
}
/**
- * {{@literal @}icu} Parses text from the beginning of the given string to produce a map from
+ * <strong>[icu]</strong> Parses text from the beginning of the given string to produce a map from
* argument to values. The method may not use the entire text of the given string.
*
* <p>See the {@link #parse(String, ParsePosition)} method for more information on
@@ -2408,7 +2408,7 @@
private static final int STATE_MSG_ELEMENT = 3;
/**
- * {{@literal @}icu} Converts an 'apostrophe-friendly' pattern into a standard
+ * <strong>[icu]</strong> Converts an 'apostrophe-friendly' pattern into a standard
* pattern.
* <em>This is obsolete for ICU 4.8 and higher MessageFormat pattern strings.</em>
* It can still be useful together with the JDK MessageFormat.
diff --git a/android_icu4j/src/main/java/android/icu/text/MessagePattern.java b/android_icu4j/src/main/java/android/icu/text/MessagePattern.java
index 7c5823a..42e1a18 100644
--- a/android_icu4j/src/main/java/android/icu/text/MessagePattern.java
+++ b/android_icu4j/src/main/java/android/icu/text/MessagePattern.java
@@ -293,7 +293,6 @@
/**
* @return true if getApostropheMode() == ApostropheMode.DOUBLE_REQUIRED
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
/* package */ boolean jdkAposMode() {
@@ -1346,7 +1345,6 @@
/**
* Appends the s[start, limit[ substring to sb, but with only half of the apostrophes
* according to JDK pattern behavior.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
/* package */ static void appendReducedApostrophes(String s, int start, int limit,
diff --git a/android_icu4j/src/main/java/android/icu/text/Normalizer.java b/android_icu4j/src/main/java/android/icu/text/Normalizer.java
index d7623b4..95eac23 100644
--- a/android_icu4j/src/main/java/android/icu/text/Normalizer.java
+++ b/android_icu4j/src/main/java/android/icu/text/Normalizer.java
@@ -231,7 +231,6 @@
public static abstract class Mode {
/**
* Sole constructor
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -241,7 +240,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1609,7 +1607,7 @@
* @throws IllegalArgumentException if the given index is less than
* {@link #getBeginIndex} or greater than {@link #getEndIndex}.
* @deprecated ICU 3.2
- * {@literal @}obsolete ICU 3.2
+ * @obsolete ICU 3.2
* @hide original deprecated method
*/
@Deprecated
diff --git a/android_icu4j/src/main/java/android/icu/text/Normalizer2.java b/android_icu4j/src/main/java/android/icu/text/Normalizer2.java
index f08d03b..4a57baf 100644
--- a/android_icu4j/src/main/java/android/icu/text/Normalizer2.java
+++ b/android_icu4j/src/main/java/android/icu/text/Normalizer2.java
@@ -411,7 +411,6 @@
/**
* Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/NumberFormat.java b/android_icu4j/src/main/java/android/icu/text/NumberFormat.java
index b945788..814bb9c 100644
--- a/android_icu4j/src/main/java/android/icu/text/NumberFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/NumberFormat.java
@@ -31,7 +31,7 @@
import android.icu.util.UResourceBundle;
/**
- * {{@literal @}icuenhanced java.text.NumberFormat}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.NumberFormat}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <code>NumberFormat</code> is the abstract base class for all number
* formats. This class provides the interface for formatting and parsing
@@ -171,58 +171,56 @@
public abstract class NumberFormat extends UFormat {
/**
- * {{@literal @}icu} Constant to specify normal number style of format.
+ * <strong>[icu]</strong> Constant to specify normal number style of format.
*/
public static final int NUMBERSTYLE = 0;
/**
- * {{@literal @}icu} Constant to specify general currency style of format. Defaults to
+ * <strong>[icu]</strong> Constant to specify general currency style of format. Defaults to
* STANDARDCURRENCYSTYLE, using currency symbol, for example "$3.00", with
* non-accounting style for negative values (e.g. minus sign).
* The specific style may be specified using the -cf- locale key.
*/
public static final int CURRENCYSTYLE = 1;
/**
- * {{@literal @}icu} Constant to specify a style of format to display percent.
+ * <strong>[icu]</strong> Constant to specify a style of format to display percent.
*/
public static final int PERCENTSTYLE = 2;
/**
- * {{@literal @}icu} Constant to specify a style of format to display scientific number.
+ * <strong>[icu]</strong> Constant to specify a style of format to display scientific number.
*/
public static final int SCIENTIFICSTYLE = 3;
/**
- * {{@literal @}icu} Constant to specify a integer number style format.
+ * <strong>[icu]</strong> Constant to specify a integer number style format.
*/
public static final int INTEGERSTYLE = 4;
/**
- * {{@literal @}icu} Constant to specify currency style of format which uses currency
+ * <strong>[icu]</strong> Constant to specify currency style of format which uses currency
* ISO code to represent currency, for example: "USD3.00".
*/
public static final int ISOCURRENCYSTYLE = 5;
/**
- * {{@literal @}icu} Constant to specify currency style of format which uses currency
+ * <strong>[icu]</strong> Constant to specify currency style of format which uses currency
* long name with plural format to represent currency, for example,
* "3.00 US Dollars".
*/
public static final int PLURALCURRENCYSTYLE = 6;
/**
- * {{@literal @}icu} Constant to specify currency style of format which uses currency symbol
+ * <strong>[icu]</strong> Constant to specify currency style of format which uses currency symbol
* to represent currency for accounting, for example: "($3.00), instead of
* "-$3.00" ({@link #CURRENCYSTYLE}).
* Overrides any style specified using -cf- key in locale.
*/
public static final int ACCOUNTINGCURRENCYSTYLE = 7;
/**
- * {{@literal @}icu} Constant to specify currency cash style of format which uses currency
+ * <strong>[icu]</strong> Constant to specify currency cash style of format which uses currency
* ISO code to represent currency, for example: "NT$3" instead of "NT$3.23".
*/
public static final int CASHCURRENCYSTYLE = 8;
/**
- * {{@literal @}icu} Constant to specify currency style of format which uses currency symbol
+ * <strong>[icu]</strong> Constant to specify currency style of format which uses currency symbol
* to represent currency, for example "$3.00", using non-accounting style for
* negative values (e.g. minus sign).
* Overrides any style specified using -cf- key in locale.
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final int STANDARDCURRENCYSTYLE = 9;
@@ -243,7 +241,7 @@
/**
* Formats a number and appends the resulting text to the given string buffer.
- * {{@literal @}icunote} recognizes <code>BigInteger</code>
+ * <strong>[icu] Note:</strong> recognizes <code>BigInteger</code>
* and <code>BigDecimal</code> objects.
* @see java.text.Format#format(Object, StringBuffer, FieldPosition)
*/
@@ -302,7 +300,7 @@
}
/**
- * {{@literal @}icu} Convenience method to format a BigInteger.
+ * <strong>[icu]</strong> Convenience method to format a BigInteger.
*/
public final String format(BigInteger number) {
return format(number, new StringBuffer(),
@@ -318,7 +316,7 @@
}
/**
- * {{@literal @}icu} Convenience method to format an ICU BigDecimal.
+ * <strong>[icu]</strong> Convenience method to format an ICU BigDecimal.
*/
public final String format(android.icu.math.BigDecimal number) {
return format(number, new StringBuffer(),
@@ -326,7 +324,7 @@
}
/**
- * {{@literal @}icu} Convenience method to format a CurrencyAmount.
+ * <strong>[icu]</strong> Convenience method to format a CurrencyAmount.
*/
public final String format(CurrencyAmount currAmt) {
return format(currAmt, new StringBuffer(),
@@ -349,28 +347,28 @@
StringBuffer toAppendTo,
FieldPosition pos);
/**
- * {{@literal @}icu} Formats a BigInteger. Specialization of format.
+ * <strong>[icu]</strong> Formats a BigInteger. Specialization of format.
* @see java.text.Format#format(Object, StringBuffer, FieldPosition)
*/
public abstract StringBuffer format(BigInteger number,
StringBuffer toAppendTo,
FieldPosition pos);
/**
- * {{@literal @}icu} Formats a BigDecimal. Specialization of format.
+ * <strong>[icu]</strong> Formats a BigDecimal. Specialization of format.
* @see java.text.Format#format(Object, StringBuffer, FieldPosition)
*/
public abstract StringBuffer format(java.math.BigDecimal number,
StringBuffer toAppendTo,
FieldPosition pos);
/**
- * {{@literal @}icu} Formats an ICU BigDecimal. Specialization of format.
+ * <strong>[icu]</strong> Formats an ICU BigDecimal. Specialization of format.
* @see java.text.Format#format(Object, StringBuffer, FieldPosition)
*/
public abstract StringBuffer format(android.icu.math.BigDecimal number,
StringBuffer toAppendTo,
FieldPosition pos);
/**
- * {{@literal @}icu} Formats a CurrencyAmount. Specialization of format.
+ * <strong>[icu]</strong> Formats a CurrencyAmount. Specialization of format.
* @see java.text.Format#format(Object, StringBuffer, FieldPosition)
*/
public StringBuffer format(CurrencyAmount currAmt,
@@ -466,7 +464,7 @@
}
/**
- * {{@literal @}icu} Sets whether strict parsing is in effect. When this is true, the
+ * <strong>[icu]</strong> Sets whether strict parsing is in effect. When this is true, the
* following conditions cause a parse failure (examples use the pattern "#,##0.#"):<ul>
* <li>Leading or doubled grouping separators<br>
* ',123' and '1,,234" fail</li>
@@ -486,7 +484,7 @@
}
/**
- * {{@literal @}icu} Returns whether strict parsing is in effect.
+ * <strong>[icu]</strong> Returns whether strict parsing is in effect.
* @return true if strict parsing is in effect
* @see #setParseStrict
*/
@@ -495,7 +493,7 @@
}
/**
- * {{@literal @}icu} Set a particular DisplayContext value in the formatter,
+ * <strong>[icu]</strong> Set a particular DisplayContext value in the formatter,
* such as CAPITALIZATION_FOR_STANDALONE.
*
* @param context The DisplayContext value to set.
@@ -507,7 +505,7 @@
}
/**
- * {{@literal @}icu} Get the formatter's DisplayContext value for the specified DisplayContext.Type,
+ * <strong>[icu]</strong> Get the formatter's DisplayContext value for the specified DisplayContext.Type,
* such as CAPITALIZATION.
*
* @param type the DisplayContext.Type whose value to return
@@ -544,7 +542,7 @@
}
/**
- * {{@literal @}icu} Returns the default number format for the specified locale.
+ * <strong>[icu]</strong> Returns the default number format for the specified locale.
* The default format is one of the styles provided by the other
* factory methods: getNumberInstance, getCurrencyInstance or getPercentInstance.
* Exactly which one is locale-dependent.
@@ -554,7 +552,7 @@
}
/**
- * {{@literal @}icu} Returns a specific style number format for default <code>FORMAT</code> locale.
+ * <strong>[icu]</strong> Returns a specific style number format for default <code>FORMAT</code> locale.
* @param style number format style
* @see Category#FORMAT
*/
@@ -563,7 +561,7 @@
}
/**
- * {{@literal @}icu} Returns a specific style number format for a specific locale.
+ * <strong>[icu]</strong> Returns a specific style number format for a specific locale.
* @param inLocale the specific locale.
* @param style number format style
*/
@@ -588,7 +586,7 @@
}
/**
- * {{@literal @}icu} Returns a general-purpose number format for the specified locale.
+ * <strong>[icu]</strong> Returns a general-purpose number format for the specified locale.
*/
public static NumberFormat getNumberInstance(ULocale inLocale) {
return getInstance(inLocale, NUMBERSTYLE);
@@ -627,7 +625,7 @@
}
/**
- * {{@literal @}icu} Returns an integer number format for the specified locale. The
+ * <strong>[icu]</strong> Returns an integer number format for the specified locale. The
* returned number format is configured to round floating point numbers
* to the nearest integer using IEEE half-even rounding (see {@link
* android.icu.math.BigDecimal#ROUND_HALF_EVEN ROUND_HALF_EVEN}) for formatting,
@@ -659,7 +657,7 @@
}
/**
- * {{@literal @}icu} Returns a currency format for the specified locale.
+ * <strong>[icu]</strong> Returns a currency format for the specified locale.
* @return a number format for currency
*/
public static NumberFormat getCurrencyInstance(ULocale inLocale) {
@@ -684,7 +682,7 @@
}
/**
- * {{@literal @}icu} Returns a percentage format for the specified locale.
+ * <strong>[icu]</strong> Returns a percentage format for the specified locale.
* @return a number format for percents
*/
public static NumberFormat getPercentInstance(ULocale inLocale) {
@@ -692,7 +690,7 @@
}
/**
- * {{@literal @}icu} Returns a scientific format for the current default <code>FORMAT</code> locale.
+ * <strong>[icu]</strong> Returns a scientific format for the current default <code>FORMAT</code> locale.
* @return a scientific number format
* @see Category#FORMAT
*/
@@ -701,7 +699,7 @@
}
/**
- * {{@literal @}icu} Returns a scientific format for the specified locale.
+ * <strong>[icu]</strong> Returns a scientific format for the specified locale.
* @return a scientific number format
*/
public static NumberFormat getScientificInstance(Locale inLocale) {
@@ -709,7 +707,7 @@
}
/**
- * {{@literal @}icu} Returns a scientific format for the specified locale.
+ * <strong>[icu]</strong> Returns a scientific format for the specified locale.
* @return a scientific number format
*/
public static NumberFormat getScientificInstance(ULocale inLocale) {
@@ -910,10 +908,8 @@
}
/**
- * {{@literal @}icu} Returns the list of Locales for which NumberFormats are available.
+ * <strong>[icu]</strong> Returns the list of Locales for which NumberFormats are available.
* @return the available locales
- * {@literal @}draft ICU 3.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale[] getAvailableULocales() {
@@ -924,7 +920,7 @@
}
/**
- * {{@literal @}icu} Registers a new NumberFormatFactory. The factory is adopted by
+ * <strong>[icu]</strong> Registers a new NumberFormatFactory. The factory is adopted by
* the service and must not be modified. The returned object is a
* key that can be used to unregister this factory.
*
@@ -943,7 +939,7 @@
}
/**
- * {{@literal @}icu} Unregisters the factory or instance associated with this key (obtained from
+ * <strong>[icu]</strong> Unregisters the factory or instance associated with this key (obtained from
* registerInstance or registerFactory).
* @param registryKey a key obtained from registerFactory
* @return true if the object was successfully unregistered
@@ -1174,7 +1170,6 @@
* should override this method as needed. Unlike getCurrency(),
* this method should never return null.
* @return a non-null Currency
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/PluralFormat.java b/android_icu4j/src/main/java/android/icu/text/PluralFormat.java
index 8bef478..148d7af 100644
--- a/android_icu4j/src/main/java/android/icu/text/PluralFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/PluralFormat.java
@@ -521,7 +521,6 @@
* only MessageFormat and PluralFormat have PluralSelector implementations.
* Therefore, PluralRules is not marked to implement this non-public interface,
* to avoid confusing users.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
/*package*/ interface PluralSelector {
diff --git a/android_icu4j/src/main/java/android/icu/text/PluralRanges.java b/android_icu4j/src/main/java/android/icu/text/PluralRanges.java
index 1483762..2b3b5dd 100644
--- a/android_icu4j/src/main/java/android/icu/text/PluralRanges.java
+++ b/android_icu4j/src/main/java/android/icu/text/PluralRanges.java
@@ -19,7 +19,6 @@
* be chosen. The rules for determining this value vary widely across locales.
*
* @author markdavis
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -35,7 +34,6 @@
/**
* Constructor
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -196,7 +194,6 @@
* plural category for the end of the range
* @param result
* the resulting plural category
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -239,7 +236,6 @@
* @param end
* plural category for the end of the range
* @return the resulting plural category, or 'end' if there is no data.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -258,7 +254,6 @@
* @param end
* plural category for the end of the range
* @return whether the value for (start,end) is explicit or not.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -273,7 +268,6 @@
* @param count
* plural category to test
* @return true if set
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -284,7 +278,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -303,7 +296,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -315,7 +307,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -326,7 +317,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -337,7 +327,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -349,7 +338,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -363,7 +351,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/PluralRules.java b/android_icu4j/src/main/java/android/icu/text/PluralRules.java
index ebee8eb..6ab783d 100644
--- a/android_icu4j/src/main/java/android/icu/text/PluralRules.java
+++ b/android_icu4j/src/main/java/android/icu/text/PluralRules.java
@@ -172,7 +172,6 @@
// TODO Remove RulesList by moving its API and fields into PluralRules.
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -180,7 +179,6 @@
@Deprecated
public static final String CATEGORY_SEPARATOR = "; ";
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -196,7 +194,6 @@
/**
* Provides a factory for returning plural rules
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -205,7 +202,6 @@
public static abstract class Factory {
/**
* Sole constructor
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -228,7 +224,6 @@
* @return The predefined <code>PluralRules</code> object for this locale. If there's no predefined rules for
* this locale, the rules for the closest parent in the locale hierarchy that has one will be returned.
* The final fallback always returns the default rules.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -240,7 +235,6 @@
* Utility for getting CARDINAL rules.
* @param locale the locale
* @return plural rules.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -253,7 +247,6 @@
/**
* Returns the locales for which there is plurals data.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -274,7 +267,6 @@
* if not null and of length > 0, this will hold 'true' at index 0 if locale is directly defined
* (without fallback) as having plural rules
* @return the functionally-equivalent locale
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -284,7 +276,6 @@
/**
* Returns the default factory.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -296,7 +287,6 @@
/**
* Returns whether or not there are overrides.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -427,7 +417,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -436,7 +425,6 @@
public static class FixedDecimal extends Number implements Comparable<FixedDecimal> {
private static final long serialVersionUID = -4756200506571685661L;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -444,7 +432,6 @@
@Deprecated
public final double source;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -452,7 +439,6 @@
@Deprecated
public final int visibleDecimalDigitCount;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -460,7 +446,6 @@
@Deprecated
public final int visibleDecimalDigitCountWithoutTrailingZeros;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -468,7 +453,6 @@
@Deprecated
public final long decimalDigits;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -476,7 +460,6 @@
@Deprecated
public final long decimalDigitsWithoutTrailingZeros;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -484,7 +467,6 @@
@Deprecated
public final long integerValue;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -492,7 +474,6 @@
@Deprecated
public final boolean hasIntegerValue;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -502,7 +483,6 @@
private final int baseFactor;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -513,7 +493,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -524,7 +503,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -535,7 +513,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -546,7 +523,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -557,7 +533,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -568,7 +543,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -579,7 +553,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -590,7 +563,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -603,7 +575,6 @@
static final long MAX = (long)1E18;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @param n is the original number
* @param v number of digits to the right of the decimal place. e.g 1.00 = 2 25. = 0
@@ -652,7 +623,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -676,7 +646,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -687,7 +656,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -702,11 +670,10 @@
* Return a guess as to the number of decimals that would be displayed. This is only a guess; callers should
* always supply the decimals explicitly if possible. Currently, it is up to 6 decimals (without trailing zeros).
* Returns 0 for infinities and nans.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
- *
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
+ *
*/
@Deprecated
public static int decimals(double n) {
@@ -752,7 +719,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -774,7 +740,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -792,7 +757,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -804,7 +768,6 @@
/**
* We're not going to care about NaN.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -828,7 +791,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -850,7 +812,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -863,7 +824,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -875,7 +835,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -886,7 +845,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -899,7 +857,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -911,7 +868,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -923,7 +879,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -935,7 +890,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -959,7 +913,6 @@
/**
* Selection parameter for either integer-only or decimal-only.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -967,14 +920,12 @@
@Deprecated
public enum SampleType {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
INTEGER,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -984,7 +935,6 @@
/**
* A range of NumberInfo that includes all values with the same visibleFractionDigitCount.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -992,7 +942,6 @@
@Deprecated
public static class FixedDecimalRange {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1000,7 +949,6 @@
@Deprecated
public final FixedDecimal start;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1008,7 +956,6 @@
@Deprecated
public final FixedDecimal end;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1022,7 +969,6 @@
this.end = end;
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1036,7 +982,6 @@
/**
* A list of NumberInfo that includes all values with the same visibleFractionDigitCount.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1044,7 +989,6 @@
@Deprecated
public static class FixedDecimalSamples {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1052,7 +996,6 @@
@Deprecated
public final SampleType sampleType;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1060,7 +1003,6 @@
@Deprecated
public final Set<FixedDecimalRange> samples;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1132,7 +1074,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1152,7 +1093,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1177,7 +1117,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1188,7 +1127,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1753,7 +1691,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1892,7 +1829,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1900,49 +1836,42 @@
@Deprecated
public enum StandardPluralCategories {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
zero,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
one,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
two,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
few,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
many,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
other;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1951,7 +1880,6 @@
public static final List<StandardPluralCategories> VALUES
= Collections.unmodifiableList(Arrays.asList(values()));
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2092,7 +2020,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2119,7 +2046,6 @@
*
* @param number The number for which the rule has to be determined.
* @return The keyword of the selected rule.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2135,7 +2061,6 @@
*
* @param sample The number information for which the rule has to be determined.
* @return The keyword of the selected rule.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2151,7 +2076,6 @@
*
* @param sample The number information for which the rule has to be determined.
* @param keyword The keyword to filter on
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2207,7 +2131,6 @@
* @return the values that trigger this keyword, or null. The returned collection
* is immutable. It will be empty if the keyword is not defined.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2245,7 +2168,6 @@
* @param keyword the keyword to test
* @param sampleType the type of samples requested, INTEGER or DECIMAL
* @return a list of values matching the keyword.
- * {@literal @}internal
* @deprecated ICU internal only
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2288,7 +2210,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2315,7 +2236,6 @@
* @param keyword the keyword to test
* @param sampleType the type of samples requested, INTEGER or DECIMAL
* @return a list of values matching the keyword.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2328,8 +2248,6 @@
/**
* Returns the set of locales for which PluralRules are known.
* @return the set of locales for which PluralRules are known, as a list
- * {@literal @}draft ICU 4.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale[] getAvailableULocales() {
@@ -2350,8 +2268,6 @@
* @param isAvailable if not null and of length > 0, this will hold 'true' at
* index 0 if locale is directly defined (without fallback) as having plural rules
* @return the functionally-equivalent locale
- * {@literal @}draft ICU 4.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale getFunctionalEquivalent(ULocale locale, boolean[] isAvailable) {
@@ -2385,48 +2301,36 @@
/**
* Status of the keyword for the rules, given a set of explicit values.
*
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public enum KeywordStatus {
/**
* The keyword is not valid for the rules.
*
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
INVALID,
/**
* The keyword is valid, but unused (it is covered by the explicit values, OR has no values for the given {@link SampleType}).
*
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
SUPPRESSED,
/**
* The keyword is valid, used, and has a single possible value (before considering explicit values).
*
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
UNIQUE,
/**
* The keyword is valid, used, not unique, and has a finite set of values.
*
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
BOUNDED,
/**
* The keyword is valid but not bounded; there indefinitely many matching values.
*
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
UNBOUNDED
@@ -2445,8 +2349,6 @@
* @param uniqueValue
* If non null, set to the unique value.
* @return the KeywordStatus
- * {@literal @}draft ICU 50
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public KeywordStatus getKeywordStatus(String keyword, int offset, Set<Double> explicits,
@@ -2468,7 +2370,6 @@
* @param uniqueValue
* If non null, set to the unique value.
* @return the KeywordStatus
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2526,7 +2427,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2552,7 +2452,6 @@
}
/**
- * {@literal @}internal
* @deprecated internal
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2563,7 +2462,6 @@
}
/**
- * {@literal @}internal
* @deprecated internal
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2574,7 +2472,6 @@
}
/**
- * {@literal @}internal
* @deprecated internal
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2585,7 +2482,6 @@
}
/**
- * {@literal @}internal
* @deprecated internal
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/PluralSamples.java b/android_icu4j/src/main/java/android/icu/text/PluralSamples.java
index 3b7b5b6..e6f10be 100644
--- a/android_icu4j/src/main/java/android/icu/text/PluralSamples.java
+++ b/android_icu4j/src/main/java/android/icu/text/PluralSamples.java
@@ -29,7 +29,6 @@
* @author markdavis
* Refactor samples as first step to moving into CLDR
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -42,7 +41,6 @@
private final Map<String, List<Double>> _keySamplesMap;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -52,7 +50,6 @@
private final Set<FixedDecimal> _fractionSamples;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -255,7 +252,6 @@
};
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/RuleBasedBreakIterator.java b/android_icu4j/src/main/java/android/icu/text/RuleBasedBreakIterator.java
index 4d9fd19..1b4b3bd 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedBreakIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedBreakIterator.java
@@ -84,7 +84,6 @@
* @param bytes a buffer supplying the compiled binary rules.
* @throws IOException if there is an error while reading the rules from the buffer.
* @see #compileRules(String, OutputStream)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -226,7 +225,6 @@
* flag set. Normal RBBI iterators don't use it, although the code
* for updating it is live. Dictionary Based break iterators (a subclass
* of us) access this field directly.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
private int fDictionaryCharCount;
@@ -286,7 +284,6 @@
/**
* Dump the contents of the state table and character classes for this break iterator.
* For debugging only.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -970,8 +967,6 @@
* @return the status from the break rule that determined the most recently
* returned break position.
*
- * {@literal @}draft ICU 3.0 (retain)
- * {@literal @}provisional This is a draft API and might change in a future release of ICU.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1009,8 +1004,6 @@
* In the event that the array is too small, the return value
* is the total number of status values that were available,
* not the reduced number that were actually returned.
- * {@literal @}draft ICU 3.0 (retain)
- * {@literal @}provisional This is a draft API and might change in a future release of ICU.
* @hide draft / provisional / internal are hidden on Android
*/
public int getRuleStatusVec(int[] fillInArray) {
@@ -1063,7 +1056,6 @@
/**
* Control debug, trace and dump options.
- * {@literal @}internal
* @hide draft / provisional / internal are hidden on Android
*/
static final String fDebugEnv = ICUDebug.enabled(RBBI_DEBUG_ARG) ?
diff --git a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
index 2628314..85daa0b 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
@@ -710,7 +710,7 @@
}
/**
- * {{@literal @}icu} Sets the variable top to the top of the specified reordering group.
+ * <strong>[icu]</strong> Sets the variable top to the top of the specified reordering group.
* The variable top determines the highest-sorting character
* which is affected by the alternate handling behavior.
* If that attribute is set to NON_IGNORABLE, then the variable top has no effect.
@@ -755,7 +755,7 @@
}
/**
- * {{@literal @}icu} Returns the maximum reordering group whose characters are affected by
+ * <strong>[icu]</strong> Returns the maximum reordering group whose characters are affected by
* the alternate handling behavior.
* @return the maximum variable reordering group.
* @see #setMaxVariable
@@ -766,7 +766,7 @@
}
/**
- * {{@literal @}icu} Sets the variable top to the primary weight of the specified string.
+ * <strong>[icu]</strong> Sets the variable top to the primary weight of the specified string.
*
* <p>Beginning with ICU 53, the variable top is pinned to
* the top of one of the supported reordering groups,
@@ -816,7 +816,7 @@
}
/**
- * {{@literal @}icu} Sets the variable top to the specified primary weight.
+ * <strong>[icu]</strong> Sets the variable top to the specified primary weight.
*
* <p>Beginning with ICU 53, the variable top is pinned to
* the top of one of the supported reordering groups,
@@ -859,7 +859,7 @@
}
/**
- * {{@literal @}icu} When numeric collation is turned on, this Collator makes
+ * <strong>[icu]</strong> When numeric collation is turned on, this Collator makes
* substrings of digits sort according to their numeric values.
*
* <p>This is a way to get '100' to sort AFTER '2'. Note that the longest
@@ -1012,7 +1012,6 @@
/**
* Adds the contractions that start with character c to the set.
* Ignores prefixes. Used by AlphabeticIndex.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1186,7 +1185,6 @@
/**
* Returns the CEs for the string.
* @param str the string
- * {@literal @}internal for tests & tools
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1219,7 +1217,7 @@
* Returns this Collator's strength attribute. The strength attribute
* determines the minimum level of difference considered significant.
*
- * <p>{{@literal @}icunote} This can return QUATERNARY strength, which is not supported by the
+ * <p><strong>[icu] Note:</strong> This can return QUATERNARY strength, which is not supported by the
* JDK version.
*
* <p>See the Collator class description for more details.
@@ -1339,7 +1337,7 @@
}
/**
- * {{@literal @}icu} Gets the variable top value of a Collator.
+ * <strong>[icu]</strong> Gets the variable top value of a Collator.
*
* @return the variable top primary weight
* @see #getMaxVariable
@@ -1601,7 +1599,6 @@
/**
* Compares two CharSequences.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1816,8 +1813,6 @@
/**
* {@inheritDoc}
- * {@literal @}draft ICU 53 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
@Override
diff --git a/android_icu4j/src/main/java/android/icu/text/RuleBasedNumberFormat.java b/android_icu4j/src/main/java/android/icu/text/RuleBasedNumberFormat.java
index 08ddd6b..f1e631b 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedNumberFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedNumberFormat.java
@@ -926,7 +926,6 @@
/**
* Mock implementation of hashCode(). This implementation always returns a constant
* value. When Java assertion is enabled, this method triggers an assertion failure.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1449,7 +1448,7 @@
}
/**
- * {{@literal @}icu} Set a particular DisplayContext value in the formatter,
+ * <strong>[icu]</strong> Set a particular DisplayContext value in the formatter,
* such as CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see
* NumberFormat.
*
@@ -1478,7 +1477,6 @@
* <code>BigDecimal.ROUND_UNNECESSARY</code>.
* @see #setRoundingMode
* @see java.math.BigDecimal
- * {@literal @}draft ICU 56
* @hide draft / provisional / internal are hidden on Android
*/
@Override
@@ -1495,7 +1493,6 @@
* @exception IllegalArgumentException if <code>roundingMode</code> is unrecognized.
* @see #getRoundingMode
* @see java.math.BigDecimal
- * {@literal @}draft ICU 56
* @hide draft / provisional / internal are hidden on Android
*/
@Override
diff --git a/android_icu4j/src/main/java/android/icu/text/RuleBasedTransliterator.java b/android_icu4j/src/main/java/android/icu/text/RuleBasedTransliterator.java
index cee59ca..fa46a04 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedTransliterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedTransliterator.java
@@ -271,7 +271,6 @@
* <p>Copyright (c) IBM Corporation 1999-2000. All rights reserved.</p>
*
* @author Alan Liu
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -326,7 +325,6 @@
/**
* Implements {@link Transliterator#handleTransliterate}.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -444,7 +442,6 @@
* \\Uxxxxxxxx. Unprintable characters are those other than
* U+000A, U+0020..U+007E.
* @return rules string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -470,7 +467,6 @@
// }
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -482,7 +478,6 @@
/**
* Temporary hack for registry problem. Needs to be replaced by better architecture.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/ScientificNumberFormatter.java b/android_icu4j/src/main/java/android/icu/text/ScientificNumberFormatter.java
index b7db369..190e7e0 100644
--- a/android_icu4j/src/main/java/android/icu/text/ScientificNumberFormatter.java
+++ b/android_icu4j/src/main/java/android/icu/text/ScientificNumberFormatter.java
@@ -30,11 +30,9 @@
* System.out.println(fmt.format(1.23456e-78));
* </pre>
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
- *
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
+ *
*/
public final class ScientificNumberFormatter {
@@ -48,8 +46,6 @@
* @param locale The locale
* @return The ScientificNumberFormatter instance.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ScientificNumberFormatter getSuperscriptInstance(ULocale locale) {
@@ -64,8 +60,6 @@
* clones it when creating the ScientificNumberFormatter.
* @return the ScientificNumberFormatter instance.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ScientificNumberFormatter getSuperscriptInstance(
@@ -81,8 +75,6 @@
* @param endMarkup the markup to end superscript e.g {@code </sup>}
* @return The ScientificNumberFormatter instance.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ScientificNumberFormatter getMarkupInstance(
@@ -103,8 +95,6 @@
* @param endMarkup the markup to end superscript e.g {@code </sup>}
* @return The ScientificNumberFormatter instance.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ScientificNumberFormatter getMarkupInstance(
@@ -121,8 +111,6 @@
* anything that DecimalFormat#format(Object) accepts.
* @return the formatted string.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String format(Object number) {
diff --git a/android_icu4j/src/main/java/android/icu/text/SearchIterator.java b/android_icu4j/src/main/java/android/icu/text/SearchIterator.java
index 1756ae2..1b9e0ec 100644
--- a/android_icu4j/src/main/java/android/icu/text/SearchIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/SearchIterator.java
@@ -683,7 +683,6 @@
protected abstract int handlePrevious(int startAt);
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/SimpleDateFormat.java b/android_icu4j/src/main/java/android/icu/text/SimpleDateFormat.java
index 522ff36..4b3fc85 100644
--- a/android_icu4j/src/main/java/android/icu/text/SimpleDateFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/SimpleDateFormat.java
@@ -43,7 +43,7 @@
/**
- * {{@literal @}icuenhanced java.text.SimpleDateFormat}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.text.SimpleDateFormat}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p><code>SimpleDateFormat</code> is a concrete class for formatting and
* parsing dates in a locale-sensitive manner. It allows for formatting
@@ -1021,7 +1021,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1062,7 +1061,6 @@
* Creates an instance of SimpleDateFormat for the given format configuration
* @param formatConfig the format configuration
* @return A SimpleDateFormat instance
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1251,7 +1249,7 @@
}
/**
- * {{@literal @}icu} Set a particular DisplayContext value in the formatter,
+ * <strong>[icu]</strong> Set a particular DisplayContext value in the formatter,
* such as CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see
* DateFormat.
*
@@ -1477,7 +1475,6 @@
* Formats a single field. This is the version called internally; it
* adds fieldNum and capitalizationContext parameters.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1502,10 +1499,9 @@
* the need to support the slow subFormat variant (above) which
* has to pass it in to us.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
- * @hide original deprecated method
- * @hide draft / provisional / internal are hidden on Android
+ * @hide original deprecated method
+ * @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
@SuppressWarnings("fallthrough")
@@ -2027,7 +2023,6 @@
/**
* Internal high-speed method. Reuses a StringBuffer for results
* instead of creating a String on the heap for each call.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2645,7 +2640,6 @@
* number indicating matching failure, otherwise. As a side effect,
* sets the <code>cal</code> field <code>field</code> to the index
* of the best match, if matching succeeded.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -2812,7 +2806,6 @@
* number indicating matching failure, otherwise. As a side effect,
* set the appropriate field of <code>cal</code> with the parsed
* value.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -3548,7 +3541,7 @@
}
/**
- * {{@literal @}icu} Gets the time zone formatter which this date/time
+ * <strong>[icu]</strong> Gets the time zone formatter which this date/time
* formatter uses to format and parse a time zone.
*
* @return the time zone formatter which this date/time
@@ -3559,7 +3552,7 @@
}
/**
- * {{@literal @}icu} Allows you to set the time zone formatter.
+ * <strong>[icu]</strong> Allows you to set the time zone formatter.
*
* @param tzfmt the new time zone formatter
*/
@@ -3796,7 +3789,6 @@
* @exception IllegalArgumentException when there is non-recognized
* pattern letter
* @return Reference to 'appendTo' parameter.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/SpoofChecker.java b/android_icu4j/src/main/java/android/icu/text/SpoofChecker.java
index f242ab5..d34ffa3 100644
--- a/android_icu4j/src/main/java/android/icu/text/SpoofChecker.java
+++ b/android_icu4j/src/main/java/android/icu/text/SpoofChecker.java
@@ -185,7 +185,6 @@
/**
* Security Profile constant from UAX 31 for use in setAllowedChars.
* Will probably be replaced by UnicodeSet property.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -198,7 +197,6 @@
/**
* Security Profile constant from UAX 31 for use in setAllowedChars.
* Will probably be replaced by UnicodeSet property.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -314,7 +312,6 @@
* Check that an identifier is no looser than the specified RestrictionLevel.
* The default if this is not called is HIGHLY_RESTRICTIVE.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -346,7 +343,6 @@
/**
* Check that an identifier does not mix numbers.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -602,7 +598,6 @@
* This method also sets RESTRICTION_LEVEL.
* @param restrictionLevel The loosest restriction level allowed.
* @return self
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1427,7 +1422,6 @@
* Get the Restriction Level that is being tested.
*
* @return The restriction level
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1508,7 +1502,6 @@
/**
* The numerics found in the string, if MIXED_NUMBERS was set; otherwise null;
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1517,7 +1510,6 @@
/**
* The restriction level that the text meets, if RESTRICTION_LEVEL is set; otherwise null.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1885,7 +1877,6 @@
*
* @param other the SpoofChecker being compared with.
* @return true if the two SpoofCheckers are equal.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1918,7 +1909,6 @@
/**
* This is a stub implementation and not designed for generic use.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/StringPrepParseException.java b/android_icu4j/src/main/java/android/icu/text/StringPrepParseException.java
index 136c027..1707a40 100644
--- a/android_icu4j/src/main/java/android/icu/text/StringPrepParseException.java
+++ b/android_icu4j/src/main/java/android/icu/text/StringPrepParseException.java
@@ -125,7 +125,6 @@
/**
* Mock implementation of hashCode(). This implementation always returns a constant
* value. When Java assertion is enabled, this method triggers an assertion failure.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/StringSearch.java b/android_icu4j/src/main/java/android/icu/text/StringSearch.java
index 965f42c..660ff98 100644
--- a/android_icu4j/src/main/java/android/icu/text/StringSearch.java
+++ b/android_icu4j/src/main/java/android/icu/text/StringSearch.java
@@ -818,7 +818,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/StringTransform.java b/android_icu4j/src/main/java/android/icu/text/StringTransform.java
index b3b2a6d..9c8c815 100644
--- a/android_icu4j/src/main/java/android/icu/text/StringTransform.java
+++ b/android_icu4j/src/main/java/android/icu/text/StringTransform.java
@@ -11,9 +11,9 @@
* Provide a base class for Transforms that focuses just on the transformation of the text. APIs that take Transliterator, but only depend on the text transformation should use this interface in the API instead.
*
* @author markdavis
- *
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public interface StringTransform extends Transform<String,String> {
/**
diff --git a/android_icu4j/src/main/java/android/icu/text/TimeUnitFormat.java b/android_icu4j/src/main/java/android/icu/text/TimeUnitFormat.java
index 9aa4557..406cf98 100644
--- a/android_icu4j/src/main/java/android/icu/text/TimeUnitFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/TimeUnitFormat.java
@@ -535,7 +535,6 @@
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -547,7 +546,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -558,7 +556,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -569,7 +566,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/TimeZoneNames.java b/android_icu4j/src/main/java/android/icu/text/TimeZoneNames.java
index b1446d5..8abc297 100644
--- a/android_icu4j/src/main/java/android/icu/text/TimeZoneNames.java
+++ b/android_icu4j/src/main/java/android/icu/text/TimeZoneNames.java
@@ -309,8 +309,6 @@
* @return A collection of matches.
* @see NameType
* @see MatchInfo
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Collection<MatchInfo> find(CharSequence text, int start, EnumSet<NameType> types) {
@@ -320,8 +318,6 @@
/**
* A <code>MatchInfo</code> represents a time zone name match used by
* {@link TimeZoneNames#find(CharSequence, int, EnumSet)}.
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static class MatchInfo {
@@ -341,8 +337,6 @@
* or 2) both <code>tzID</code> and <code>mzID</code> are <code>null</code>,
* or 3) <code>matchLength</code> is 0 or smaller.
* @see NameType
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public MatchInfo(NameType nameType, String tzID, String mzID, int matchLength) {
@@ -369,8 +363,6 @@
*
* @return the time zone ID, or <code>null</code>.
* @see #mzID()
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String tzID() {
@@ -385,8 +377,6 @@
*
* @return the meta zone ID, or <code>null</code>.
* @see #tzID()
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String mzID() {
@@ -397,8 +387,6 @@
* Returns the time zone name type.
* @return the time zone name type enum.
* @see NameType
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public NameType nameType() {
@@ -408,8 +396,6 @@
/**
* Returns the match length.
* @return the match length.
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public int matchLength() {
@@ -418,7 +404,6 @@
}
/**
- * {@literal @}internal For specific users only until proposed publicly.
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -427,7 +412,6 @@
public void loadAllDisplayNames() {}
/**
- * {@literal @}internal For specific users only until proposed publicly.
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -455,8 +439,6 @@
/**
* Sole constructor for invocation by subclass constructors.
*
- * {@literal @}draft ICU 49 (Retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected TimeZoneNames() {
@@ -465,7 +447,6 @@
/**
* The super class of <code>TimeZoneNames</code> service factory classes.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -478,7 +459,6 @@
* @param locale
* The display locale
* @return An instance of <code>TimeZoneNames</code>.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -488,7 +468,6 @@
/**
* Sole constructor
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/Transform.java b/android_icu4j/src/main/java/android/icu/text/Transform.java
index 2e8fea2..2846821 100644
--- a/android_icu4j/src/main/java/android/icu/text/Transform.java
+++ b/android_icu4j/src/main/java/android/icu/text/Transform.java
@@ -14,6 +14,7 @@
* @author markdavis
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+
*/
public interface Transform<S,D> {
diff --git a/android_icu4j/src/main/java/android/icu/text/Transliterator.java b/android_icu4j/src/main/java/android/icu/text/Transliterator.java
index a5a1546..e5f46d8 100644
--- a/android_icu4j/src/main/java/android/icu/text/Transliterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/Transliterator.java
@@ -362,7 +362,6 @@
/**
* Mock implementation of hashCode(). This implementation always returns a constant
* value. When Java assertion is enabled, this method triggers an assertion failure.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1588,7 +1587,6 @@
* change the global filter as we go.
* @param targetSet TODO
* @see #getTargetSet
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1611,7 +1609,6 @@
* Returns the intersectionof this instance's filter intersected with an external filter.
* The externalFilter must be frozen (it is frozen if not).
* The result may be frozen, so don't attempt to modify.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1928,7 +1925,6 @@
/**
* Register the script-based "Any" transliterators: Any-Latin, Any-Greek
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/UFieldPosition.java b/android_icu4j/src/main/java/android/icu/text/UFieldPosition.java
index 6a7c5fb..04206a1 100644
--- a/android_icu4j/src/main/java/android/icu/text/UFieldPosition.java
+++ b/android_icu4j/src/main/java/android/icu/text/UFieldPosition.java
@@ -12,7 +12,6 @@
/**
* Adds the ability to get the decimal digits
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -24,7 +23,6 @@
private long fractionDigits = 0;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -34,7 +32,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -44,7 +41,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -54,7 +50,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -64,7 +59,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -75,7 +69,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -85,7 +78,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/text/UFormat.java b/android_icu4j/src/main/java/android/icu/text/UFormat.java
index 04e1479..a8d1cff 100644
--- a/android_icu4j/src/main/java/android/icu/text/UFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/UFormat.java
@@ -53,8 +53,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#VALID_LOCALE
* @see android.icu.util.ULocale#ACTUAL_LOCALE
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale getLocale(ULocale.Type type) {
diff --git a/android_icu4j/src/main/java/android/icu/text/UForwardCharacterIterator.java b/android_icu4j/src/main/java/android/icu/text/UForwardCharacterIterator.java
index d14520c..26fc126 100644
--- a/android_icu4j/src/main/java/android/icu/text/UForwardCharacterIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/UForwardCharacterIterator.java
@@ -56,6 +56,7 @@
* </p>
* @hide Only a subset of ICU is exposed in Android
* @hide All android.icu classes are currently hidden
+ *
*/
public interface UForwardCharacterIterator {
diff --git a/android_icu4j/src/main/java/android/icu/text/UnicodeCompressor.java b/android_icu4j/src/main/java/android/icu/text/UnicodeCompressor.java
index 329707c..2dcea68 100644
--- a/android_icu4j/src/main/java/android/icu/text/UnicodeCompressor.java
+++ b/android_icu4j/src/main/java/android/icu/text/UnicodeCompressor.java
@@ -73,7 +73,7 @@
*
* @author Stephen F. Booth
* @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+ * @hide All android.icu classes are currently hidden
*/
/*
diff --git a/android_icu4j/src/main/java/android/icu/text/UnicodeDecompressor.java b/android_icu4j/src/main/java/android/icu/text/UnicodeDecompressor.java
index 51bcf96..6f62624 100644
--- a/android_icu4j/src/main/java/android/icu/text/UnicodeDecompressor.java
+++ b/android_icu4j/src/main/java/android/icu/text/UnicodeDecompressor.java
@@ -69,7 +69,7 @@
*
* @author Stephen F. Booth
* @hide Only a subset of ICU is exposed in Android
-* @hide All android.icu classes are currently hidden
+ * @hide All android.icu classes are currently hidden
*/
public final class UnicodeDecompressor implements SCSU
{
diff --git a/android_icu4j/src/main/java/android/icu/text/UnicodeFilter.java b/android_icu4j/src/main/java/android/icu/text/UnicodeFilter.java
index 90e5a11..469b76d 100644
--- a/android_icu4j/src/main/java/android/icu/text/UnicodeFilter.java
+++ b/android_icu4j/src/main/java/android/icu/text/UnicodeFilter.java
@@ -62,7 +62,6 @@
* happy. Java inserts a synthetic constructor and CheckTags
* can't tell that it's synthetic.)
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java b/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java
index b4b75cb..d5d612d 100644
--- a/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java
+++ b/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java
@@ -1003,7 +1003,6 @@
/**
* Tests whether the text matches at the offset. If so, returns the end of the longest substring that it matches. If not, returns -1.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1958,7 +1957,6 @@
/**
* Get the Regex equivalent for this UnicodeSet
* @return regex pattern equivalent to this UnicodeSet
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2323,7 +2321,6 @@
* @return an inversion list for the parsed substring
* of <code>pattern</code>
* @exception java.lang.IllegalArgumentException if the parse fails.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3823,23 +3820,17 @@
/**
* Internal class for customizing UnicodeSet parsing of properties.
* TODO: extend to allow customizing of codepoint ranges
- * {@literal @}draft ICU3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @author medavis
* @hide draft / provisional / internal are hidden on Android
*/
abstract public static class XSymbolTable implements SymbolTable {
/**
* Default constructor
- * {@literal @}draft ICU3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public XSymbolTable(){}
/**
* Supplies default implementation for SymbolTable (no action).
- * {@literal @}draft ICU3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public UnicodeMatcher lookupMatcher(int i) {
@@ -3862,8 +3853,6 @@
* @return returns true if the propertyName+propertyValue combination is to be overridden, and the characters
* with that property have been added to the UnicodeSet, and returns false if the
* propertyName+propertyValue combination is not recognized (in which case result is unaltered).
- * {@literal @}draft ICU3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean applyPropertyAlias(String propertyName, String propertyValue, UnicodeSet result) {
@@ -3871,8 +3860,6 @@
}
/**
* Supplies default implementation for SymbolTable (no action).
- * {@literal @}draft ICU3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public char[] lookup(String s) {
@@ -3880,8 +3867,6 @@
}
/**
* Supplies default implementation for SymbolTable (no action).
- * {@literal @}draft ICU3.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String parseReference(String text, ParsePosition pos, int limit) {
@@ -3990,7 +3975,6 @@
* <p>To replace, count elements, or delete spans, see {@link android.icu.text.UnicodeSetSpanner UnicodeSetSpanner}.
* @param outCount An output-only object (must not be null) for returning the count.
* @return the limit (exclusive end) of the span
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4464,7 +4448,6 @@
* That means that sets can't be compared directly with this method, unless they are TreeSets without
* (or with the same) comparator. Unfortunately, it is impossible to reliably detect in Java whether subclass of
* Collection satisfies the right criteria, so it is left to the user to avoid those circumstances.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4535,7 +4518,6 @@
/**
* Return the value of the first code point, if the string is exactly one code point. Otherwise return Integer.MAX_VALUE.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4551,7 +4533,6 @@
* if the dontCare set includes unassigned characters (for a particular version of Unicode).
* @param dontCare Set with the don't-care characters for spanning
* @return the input set, modified
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4571,7 +4552,6 @@
* Find the first index at or after fromIndex where the UnicodeSet matches at that index.
* If findNot is true, then reverse the sense of the match: find the first place where the UnicodeSet doesn't match.
* If there is no match, length is returned.
- * {@literal @}internal
* @deprecated This API is ICU internal only. Use span instead.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4594,7 +4574,6 @@
* If findNot is true, then reverse the sense of the match: find the last place where the UnicodeSet doesn't match.
* If there is no match, -1 is returned.
* BEFORE index is not in the UnicodeSet.
- * {@literal @}internal
* @deprecated This API is ICU internal only. Use spanBack instead.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4618,7 +4597,6 @@
* @param source The source of the CharSequence to strip from.
* @param matches A boolean to either strip all that matches or don't match with the current UnicodeSet object.
* @return The string after it has been stripped.
- * {@literal @}internal
* @deprecated This API is ICU internal only. Use replaceFrom.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4725,7 +4703,6 @@
/**
* Get the default symbol table. Null means ordinary processing. For internal use only.
* @return the symbol table
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -4745,7 +4722,6 @@
* with null to clear the value, you MUST also call {@code UnicodeProperty.ResetCacheProperties}.
*
* @param xSymbolTable the new default symbol table.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/text/UnicodeSetIterator.java b/android_icu4j/src/main/java/android/icu/text/UnicodeSetIterator.java
index 36154a0..2c0b80b 100644
--- a/android_icu4j/src/main/java/android/icu/text/UnicodeSetIterator.java
+++ b/android_icu4j/src/main/java/android/icu/text/UnicodeSetIterator.java
@@ -225,7 +225,6 @@
private int range = 0;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -236,7 +235,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -244,7 +242,6 @@
@Deprecated
protected int endElement;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -258,7 +255,6 @@
*/
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java b/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java
index 69b8d14..55f9025 100644
--- a/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java
@@ -15,7 +15,7 @@
import android.icu.impl.Grego;
/**
- * {{@literal @}icu} BasicTimeZone extends <code>TimeZone</code> with additional methods to access
+ * <strong>[icu]</strong> BasicTimeZone extends <code>TimeZone</code> with additional methods to access
* time zone transitions and rules. All ICU <code>TimeZone</code> concrete subclasses
* extend this class. APIs added to <code>java.util.TimeZone</code> by
* <code>BasicTimeZone</code> are annotated with <strong>'<font
@@ -34,7 +34,7 @@
private static final long MILLIS_PER_YEAR = 365*24*60*60*1000L;
/**
- * {{@literal @}icu} Returns the first time zone transition after the base time.
+ * <strong>[icu]</strong> Returns the first time zone transition after the base time.
* <p>Example code:{{@literal @}.jcite android.icu.samples.util.timezone.BasicTimeZoneExample:---getNextTransitionExample}
*
* @param base The base time.
@@ -47,7 +47,7 @@
public abstract TimeZoneTransition getNextTransition(long base, boolean inclusive);
/**
- * {{@literal @}icu} Returns the last time zone transition before the base time.
+ * <strong>[icu]</strong> Returns the last time zone transition before the base time.
* <p>Example code:{{@literal @}.jcite android.icu.samples.util.timezone.BasicTimeZoneExample:---getPreviousTransitionExample}
*
* @param base The base time.
@@ -60,7 +60,7 @@
public abstract TimeZoneTransition getPreviousTransition(long base, boolean inclusive);
/**
- * {{@literal @}icu} Checks if the time zone has equivalent transitions in the time range.
+ * <strong>[icu]</strong> Checks if the time zone has equivalent transitions in the time range.
* This method returns true when all of transition times, from/to standard
* offsets and DST savings used by this time zone match the other in the
* time range.
@@ -79,7 +79,7 @@
}
/**
- * {{@literal @}icu} Checks if the time zone has equivalent transitions in the time range.
+ * <strong>[icu]</strong> Checks if the time zone has equivalent transitions in the time range.
* This method returns true when all of transition times, from/to standard
* offsets and DST savings used by this time zone match the other in the
* time range.
@@ -199,7 +199,7 @@
}
/**
- * {{@literal @}icu} Returns the array of <code>TimeZoneRule</code> which represents the rule
+ * <strong>[icu]</strong> Returns the array of <code>TimeZoneRule</code> which represents the rule
* of this time zone object. The first element in the result array will
* be the <code>InitialTimeZoneRule</code> instance for the initial rule.
* The rest will be either <code>AnnualTimeZoneRule</code> or
@@ -211,7 +211,7 @@
public abstract TimeZoneRule[] getTimeZoneRules();
/**
- * {{@literal @}icu} Returns the array of <code>TimeZoneRule</code> which represents the rule
+ * <strong>[icu]</strong> Returns the array of <code>TimeZoneRule</code> which represents the rule
* of this time zone object since the specified start time. The first
* element in the result array will be the <code>InitialTimeZoneRule</code>
* instance for the initial rule. The rest will be either
@@ -356,7 +356,7 @@
}
/**
- * {{@literal @}icu} Returns the array of <code>TimeZoneRule</code> which represents the rule of
+ * <strong>[icu]</strong> Returns the array of <code>TimeZoneRule</code> which represents the rule of
* this time zone object near the specified date. Some applications are not
* capable to handle historic time zone rule changes. Also some applications
* can only handle certain type of rule definitions. This method returns
@@ -522,9 +522,8 @@
}
/**
- * {{@literal @}icu} The time type option for standard time used by
+ * <strong>[icu]</strong> The time type option for standard time used by
* {@link #getOffsetFromLocal(long, int, int, int[])}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -532,9 +531,8 @@
public static final int LOCAL_STD = 0x01;
/**
- * {{@literal @}icu} The time type option for daylight saving time used by
+ * <strong>[icu]</strong> The time type option for daylight saving time used by
* {@link #getOffsetFromLocal(long, int, int, int[])}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -542,9 +540,8 @@
public static final int LOCAL_DST = 0x03;
/**
- * {{@literal @}icu} The option designate former time to be used by
+ * <strong>[icu]</strong> The option designate former time to be used by
* {@link #getOffsetFromLocal(long, int, int, int[])}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -552,9 +549,8 @@
public static final int LOCAL_FORMER = 0x04;
/**
- * {{@literal @}icu} The option designate latter time to be used by
+ * <strong>[icu]</strong> The option designate latter time to be used by
* {@link #getOffsetFromLocal(long, int, int, int[])}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -562,9 +558,8 @@
public static final int LOCAL_LATTER = 0x0C;
/**
- * {{@literal @}icu} The bit mask for the time type option used by
+ * <strong>[icu]</strong> The bit mask for the time type option used by
* {@link #getOffsetFromLocal(long, int, int, int[])}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -572,9 +567,8 @@
protected static final int STD_DST_MASK = 0x03;
/**
- * {{@literal @}icu} The bit mask for the former/latter option used by
+ * <strong>[icu]</strong> The bit mask for the former/latter option used by
* {@link #getOffsetFromLocal(long, int, int, int[])}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -582,8 +576,7 @@
protected static final int FORMER_LATTER_MASK = 0x0C;
/**
- * {{@literal @}icu} Returns time zone offsets from local wall time.
- * {@literal @}internal
+ * <strong>[icu]</strong> Returns time zone offsets from local wall time.
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -602,7 +595,6 @@
/**
* Constructing a BasicTimeZone with the given time zone ID.
* @param ID the time zone ID.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/BytesTrieBuilder.java b/android_icu4j/src/main/java/android/icu/util/BytesTrieBuilder.java
index 0a01979..be48438 100644
--- a/android_icu4j/src/main/java/android/icu/util/BytesTrieBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/util/BytesTrieBuilder.java
@@ -121,7 +121,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -131,7 +130,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -140,7 +138,6 @@
protected int getMaxBranchLinearSubNodeLength() /*const*/ { return BytesTrie.kMaxBranchLinearSubNodeLength; }
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -149,7 +146,6 @@
protected int getMinLinearMatch() /*const*/ { return BytesTrie.kMinLinearMatch; }
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -171,7 +167,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -186,7 +181,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -216,7 +210,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -256,7 +249,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -271,7 +263,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/Calendar.java b/android_icu4j/src/main/java/android/icu/util/Calendar.java
index 1bbb08c..daa2cd0 100644
--- a/android_icu4j/src/main/java/android/icu/util/Calendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/Calendar.java
@@ -29,7 +29,7 @@
import android.icu.util.ULocale.Category;
/**
- * {{@literal @}icuenhanced java.util.Calendar}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.Calendar}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p><code>Calendar</code> is an abstract base class for converting between
* a <code>Date</code> object and a set of integer fields such as
@@ -872,7 +872,7 @@
public final static int DST_OFFSET = 16;
/**
- * {{@literal @}icu} Field number for <code>get()</code> and <code>set()</code>
+ * <strong>[icu]</strong> Field number for <code>get()</code> and <code>set()</code>
* indicating the extended year corresponding to the
* {@link #WEEK_OF_YEAR} field. This may be one greater or less
* than the value of {@link #EXTENDED_YEAR}.
@@ -880,14 +880,14 @@
public static final int YEAR_WOY = 17;
/**
- * {{@literal @}icu} Field number for <code>get()</code> and <code>set()</code>
+ * <strong>[icu]</strong> Field number for <code>get()</code> and <code>set()</code>
* indicating the localized day of week. This will be a value from 1
* to 7 inclusive, with 1 being the localized first day of the week.
*/
public static final int DOW_LOCAL = 18;
/**
- * {{@literal @}icu} Field number for <code>get()</code> and <code>set()</code>
+ * <strong>[icu]</strong> Field number for <code>get()</code> and <code>set()</code>
* indicating the extended year. This is a single number designating
* the year of this calendar system, encompassing all supra-year
* fields. For example, for the Julian calendar system, year numbers
@@ -898,7 +898,7 @@
public static final int EXTENDED_YEAR = 19;
/**
- * {{@literal @}icu} Field number for <code>get()</code> and <code>set()</code>
+ * <strong>[icu]</strong> Field number for <code>get()</code> and <code>set()</code>
* indicating the modified Julian day number. This is different from
* the conventional Julian day number in two regards. First, it
* demarcates days at local zone midnight, rather than noon GMT.
@@ -909,7 +909,7 @@
public static final int JULIAN_DAY = 20;
/**
- * {{@literal @}icu} Field number for <code>get()</code> and <code>set()</code>
+ * <strong>[icu]</strong> Field number for <code>get()</code> and <code>set()</code>
* indicating the milliseconds in the day. This ranges from 0 to
* 23:59:59.999 (regardless of DST). This field behaves
* <em>exactly</em> like a composite of all time-related fields, not
@@ -922,7 +922,7 @@
public static final int MILLISECONDS_IN_DAY = 21;
/**
- * {{@literal @}icu} Field indicating whether or not the current month is a leap month.
+ * <strong>[icu]</strong> Field indicating whether or not the current month is a leap month.
* Should have a value of 0 for non-leap months, and 1 for leap months.
*/
public static final int IS_LEAP_MONTH = 22;
@@ -1073,7 +1073,7 @@
public final static int PM = 1;
/**
- * {{@literal @}icu} Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
+ * <strong>[icu]</strong> Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
* weekday.
* @see #WEEKEND
* @see #WEEKEND_ONSET
@@ -1086,7 +1086,7 @@
public static final int WEEKDAY = 0;
/**
- * {{@literal @}icu} Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
+ * <strong>[icu]</strong> Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
* weekend day.
* @see #WEEKDAY
* @see #WEEKEND_ONSET
@@ -1099,7 +1099,7 @@
public static final int WEEKEND = 1;
/**
- * {{@literal @}icu} Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
+ * <strong>[icu]</strong> Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
* day that starts as a weekday and transitions to the weekend.
* Call getWeekendTransition() to get the point of transition.
* @see #WEEKDAY
@@ -1113,7 +1113,7 @@
public static final int WEEKEND_ONSET = 2;
/**
- * {{@literal @}icu} Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
+ * <strong>[icu]</strong> Value returned by getDayOfWeekType(int dayOfWeek) to indicate a
* day that starts as the weekend and transitions to a weekday.
* Call getWeekendTransition() to get the point of transition.
* @see #WEEKDAY
@@ -1127,7 +1127,7 @@
public static final int WEEKEND_CEASE = 3;
/**
- * {{@literal @}icu}Option used by {@link #setRepeatedWallTimeOption(int)} and
+ * <strong>[icu]</strong>Option used by {@link #setRepeatedWallTimeOption(int)} and
* {@link #setSkippedWallTimeOption(int)} specifying an ambiguous wall time
* to be interpreted as the latest.
* @see #setRepeatedWallTimeOption(int)
@@ -1138,7 +1138,7 @@
public static final int WALLTIME_LAST = 0;
/**
- * {{@literal @}icu}Option used by {@link #setRepeatedWallTimeOption(int)} and
+ * <strong>[icu]</strong>Option used by {@link #setRepeatedWallTimeOption(int)} and
* {@link #setSkippedWallTimeOption(int)} specifying an ambiguous wall time
* to be interpreted as the earliest.
* @see #setRepeatedWallTimeOption(int)
@@ -1149,7 +1149,7 @@
public static final int WALLTIME_FIRST = 1;
/**
- * {{@literal @}icu}Option used by {@link #setSkippedWallTimeOption(int)} specifying an
+ * <strong>[icu]</strong>Option used by {@link #setSkippedWallTimeOption(int)} specifying an
* ambiguous wall time to be interpreted as the next valid wall time.
* @see #setSkippedWallTimeOption(int)
* @see #getSkippedWallTimeOption()
@@ -1829,10 +1829,8 @@
}
/**
- * {{@literal @}icu} Returns the list of locales for which Calendars are installed.
+ * <strong>[icu]</strong> Returns the list of locales for which Calendars are installed.
* @return the list of locales for which Calendars are installed.
- * {@literal @}draft ICU 3.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static ULocale[] getAvailableULocales()
@@ -1842,7 +1840,7 @@
}
/**
- * {{@literal @}icu} Given a key and a locale, returns an array of string values in a preferred
+ * <strong>[icu]</strong> Given a key and a locale, returns an array of string values in a preferred
* order that would make a difference. These are all and only those values where
* the open (creation) of the service with the locale formed from the input locale
* plus input keyword and that value has different behavior than creation with the
@@ -2098,7 +2096,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2175,7 +2172,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2299,7 +2295,7 @@
}
/**
- * {{@literal @}icu} Returns true if the given Calendar object is equivalent to this
+ * <strong>[icu]</strong> Returns true if the given Calendar object is equivalent to this
* one. An equivalent Calendar will behave exactly as this one
* does, but it may be set to a different time. By contrast, for
* the equals() method to return true, the other Calendar must
@@ -2695,7 +2691,7 @@
* result in negative years for era 0 (that is the only way to represent years before
* the calendar epoch in such calendars).
* <p>
- * {{@literal @}icunote} the ICU implementation of this method is able to roll
+ * <strong>[icu] Note:</strong> the ICU implementation of this method is able to roll
* all fields except for {@link #ERA ERA}, {@link #DST_OFFSET DST_OFFSET},
* and {@link #ZONE_OFFSET ZONE_OFFSET}. Subclasses may, of course, add support for
* additional fields in their overrides of <code>roll</code>.
@@ -3075,7 +3071,7 @@
* calendar, starting with 100 BC and adding +1 to year results in 99 BC (even though
* this actually reduces the numeric value of the field itself).
* <p>
- * {{@literal @}icunote} The ICU implementation of this method is able to add to
+ * <strong>[icu] Note:</strong> The ICU implementation of this method is able to add to
* all fields except for {@link #ERA ERA}, {@link #DST_OFFSET DST_OFFSET},
* and {@link #ZONE_OFFSET ZONE_OFFSET}. Subclasses may, of course, add support for
* additional fields in their overrides of <code>add</code>.
@@ -3329,7 +3325,7 @@
//-------------------------------------------------------------------------
/**
- * {{@literal @}icu} Returns a <code>DateFormat</code> appropriate to this calendar.
+ * <strong>[icu]</strong> Returns a <code>DateFormat</code> appropriate to this calendar.
* Subclasses wishing to specialize this behavior should override
* {@link #handleGetDateFormat}.
*/
@@ -3338,7 +3334,7 @@
}
/**
- * {{@literal @}icu} Returns a <code>DateFormat</code> appropriate to this calendar.
+ * <strong>[icu]</strong> Returns a <code>DateFormat</code> appropriate to this calendar.
* Subclasses wishing to specialize this behavior should override
* {@link #handleGetDateFormat}.
*/
@@ -3404,8 +3400,6 @@
* subclass
* @param locale the locale for which the symbols should be drawn
* @return a <code>DateFormat</code> appropriate to this calendar
- * {@literal @}draft ICU 3.2 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected DateFormat handleGetDateFormat(String pattern, String override, ULocale locale) {
@@ -3523,7 +3517,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3593,7 +3586,6 @@
* date format configuration and used for calling the ICU private
* SimpleDateFormat factory method.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3613,7 +3605,6 @@
/**
* Returns the pattern string
* @return the format pattern string
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3624,7 +3615,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3637,7 +3627,6 @@
/**
* Returns the calendar
* @return the calendar
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3650,7 +3639,6 @@
/**
* Returns the locale
* @return the locale
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3663,7 +3651,6 @@
/**
* Returns the format symbols
* @return the format symbols
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3819,7 +3806,7 @@
private static final int FIELD_DIFF_MAX_INT = Integer.MAX_VALUE; // 2147483647
/**
- * {{@literal @}icu} Returns the difference between the given time and the time this
+ * <strong>[icu]</strong> Returns the difference between the given time and the time this
* calendar object is set to. If this calendar is set
* <em>before</em> the given time, the returned value will be
* positive. If this calendar is set <em>after</em> the given
@@ -4015,7 +4002,7 @@
}
/**
- * {{@literal @}icu}Sets the behavior for handling wall time repeating multiple times
+ * <strong>[icu]</strong>Sets the behavior for handling wall time repeating multiple times
* at negative time zone offset transitions. For example, 1:30 AM on
* November 6, 2011 in US Eastern time (Ameirca/New_York) occurs twice;
* 1:30 AM EDT, then 1:30 AM EST one hour later. When <code>WALLTIME_FIRST</code>
@@ -4041,7 +4028,7 @@
}
/**
- * {{@literal @}icu}Gets the behavior for handling wall time repeating multiple times
+ * <strong>[icu]</strong>Gets the behavior for handling wall time repeating multiple times
* at negative time zone offset transitions.
*
* @return the behavior for handling repeating wall time, either
@@ -4056,7 +4043,7 @@
}
/**
- * {{@literal @}icu}Sets the behavior for handling skipped wall time at positive time zone offset
+ * <strong>[icu]</strong>Sets the behavior for handling skipped wall time at positive time zone offset
* transitions. For example, 2:30 AM on March 13, 2011 in US Eastern time (America/New_York)
* does not exist because the wall time jump from 1:59 AM EST to 3:00 AM EDT. When
* <code>WALLTIME_FIRST</code> is used, 2:30 AM is interpreted as 30 minutes before 3:00 AM
@@ -4088,7 +4075,7 @@
}
/**
- * {{@literal @}icu}Gets the behavior for handling skipped wall time at positive time zone offset
+ * <strong>[icu]</strong>Gets the behavior for handling skipped wall time at positive time zone offset
* transitions.
*
* @return the behavior for handling skipped wall time, one of
@@ -4343,7 +4330,7 @@
//-------------------------------------------------------------------------
/**
- * {{@literal @}icu} Returns whether the given day of the week is a weekday, a
+ * <strong>[icu]</strong> Returns whether the given day of the week is a weekday, a
* weekend day, or a day that transitions from one to the other, for the
* locale and calendar system associated with this Calendar (the locale's
* region is often the most determinant factor). If a transition occurs at
@@ -4398,7 +4385,7 @@
}
/**
- * {{@literal @}icu} Returns the time during the day at which the weekend begins or end in this
+ * <strong>[icu]</strong> Returns the time during the day at which the weekend begins or end in this
* calendar system. If getDayOfWeekType(dayOfWeek) == WEEKEND_ONSET return the time
* at which the weekend begins. If getDayOfWeekType(dayOfWeek) == WEEKEND_CEASE
* return the time at which the weekend ends. If getDayOfWeekType(dayOfWeek) has some
@@ -4426,7 +4413,7 @@
}
/**
- * {{@literal @}icu} Returns true if the given date and time is in the weekend in this calendar
+ * <strong>[icu]</strong> Returns true if the given date and time is in the weekend in this calendar
* system. Equivalent to calling setTime() followed by isWeekend(). Note: This
* method changes the time this calendar is set to.
* @param date the date and time
@@ -4442,7 +4429,7 @@
}
/**
- * {{@literal @}icu} Returns true if this Calendar's current date and time is in the weekend in
+ * <strong>[icu]</strong> Returns true if this Calendar's current date and time is in the weekend in
* this calendar system.
* @return true if the given date and time is part of the
* weekend
@@ -4633,7 +4620,7 @@
}
/**
- * {{@literal @}icu} Return simple, immutable struct-like class for access to the CLDR weekend data.
+ * <strong>[icu]</strong> Return simple, immutable struct-like class for access to the CLDR weekend data.
* @param region The input region. The results are undefined if the region code is not valid.
* @return the WeekData for the input region. It is never null.
*/
@@ -4642,7 +4629,7 @@
}
/**
- * {{@literal @}icu} Return simple, immutable struct-like class for access to the weekend data in this calendar.
+ * <strong>[icu]</strong> Return simple, immutable struct-like class for access to the weekend data in this calendar.
* @return the WeekData for this calendar.
*/
public WeekData getWeekData() {
@@ -4650,7 +4637,7 @@
}
/**
- * {{@literal @}icu} Set data in this calendar based on the WeekData input.
+ * <strong>[icu]</strong> Set data in this calendar based on the WeekData input.
* @param wdata The week data to use
* @return this, for chaining
*/
@@ -5603,8 +5590,6 @@
* taking year and era into account. Defaults to 0 (JANUARY) for Gregorian.
* @param extendedYear the extendedYear, as returned by handleGetExtendedYear
* @return the default month
- * {@literal @}draft ICU 3.6 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @see #MONTH
* @hide draft / provisional / internal are hidden on Android
*/
@@ -5619,8 +5604,6 @@
* @param extendedYear the extendedYear, as returned by handleGetExtendedYear
* @param month the month, as returned by getDefaultMonthInYear
* @return the default day of the month
- * {@literal @}draft ICU 3.6 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @see #DAY_OF_MONTH
* @hide draft / provisional / internal are hidden on Android
*/
@@ -5878,7 +5861,7 @@
}
/**
- * {{@literal @}icu} Returns the number of fields defined by this calendar. Valid field
+ * <strong>[icu]</strong> Returns the number of fields defined by this calendar. Valid field
* arguments to <code>set()</code> and <code>get()</code> are
* <code>0..getFieldCount()-1</code>.
*/
@@ -6097,7 +6080,7 @@
}
/**
- * {{@literal @}icu} Returns the calendar type name string for this Calendar object.
+ * <strong>[icu]</strong> Returns the calendar type name string for this Calendar object.
* The returned string is the legacy ICU calendar attribute value,
* for example, "gregorian" or "japanese".
*
@@ -6118,7 +6101,6 @@
* Chinese calendar and Japanese calendar).
*
* @return <code>true<code> if this calendar has a default century.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -6131,7 +6113,7 @@
// -------- BEGIN ULocale boilerplate --------
/**
- * {{@literal @}icu} Returns the locale that was used to create this object, or null.
+ * <strong>[icu]</strong> Returns the locale that was used to create this object, or null.
* This may may differ from the locale requested at the time of
* this object's creation. For example, if an object is created
* for locale <tt>en_US_CALIFORNIA</tt>, the actual data may be
@@ -6151,8 +6133,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#VALID_LOCALE
* @see android.icu.util.ULocale#ACTUAL_LOCALE
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public final ULocale getLocale(ULocale.Type type) {
diff --git a/android_icu4j/src/main/java/android/icu/util/CharsTrieBuilder.java b/android_icu4j/src/main/java/android/icu/util/CharsTrieBuilder.java
index ad2cb5a..62ab537 100644
--- a/android_icu4j/src/main/java/android/icu/util/CharsTrieBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/util/CharsTrieBuilder.java
@@ -99,7 +99,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -109,7 +108,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -118,7 +116,6 @@
protected int getMaxBranchLinearSubNodeLength() /*const*/ { return CharsTrie.kMaxBranchLinearSubNodeLength; }
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -127,7 +124,6 @@
protected int getMinLinearMatch() /*const*/ { return CharsTrie.kMinLinearMatch; }
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -149,7 +145,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -164,7 +159,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -194,7 +188,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -223,7 +216,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -252,7 +244,6 @@
}
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java b/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java
index ad38946..1345e4b 100644
--- a/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/ChineseCalendar.java
@@ -323,7 +323,6 @@
* Construct a <code>ChineseCalenar</code> based on the current time
* with the given time zone, the locale, the epoch year and the time zone
* used for astronomical calculation.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1001,7 +1000,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/util/CompactByteArray.java b/android_icu4j/src/main/java/android/icu/util/CompactByteArray.java
index d44d888..6ab6cd7 100644
--- a/android_icu4j/src/main/java/android/icu/util/CompactByteArray.java
+++ b/android_icu4j/src/main/java/android/icu/util/CompactByteArray.java
@@ -27,7 +27,6 @@
*
* @see CompactCharArray
* @author Helena Shih
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -38,7 +37,6 @@
/**
* The total number of Unicode characters.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -48,7 +46,6 @@
/**
* Default constructor for CompactByteArray, the default value of the
* compact array is 0.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -61,7 +58,6 @@
/**
* Constructor for CompactByteArray.
* @param defaultValue the default value of the compact array.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -89,7 +85,6 @@
* @param indexArray the indicies of the compact array.
* @param newValues the values of the compact array.
* @exception IllegalArgumentException If the index is out of range.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -118,7 +113,6 @@
*
* @throws IllegalArgumentException if the index or value array is
* the wrong size.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -134,7 +128,6 @@
* Get the mapped value of a Unicode character.
* @param index the character to get the mapped value with
* @return the mapped value of the given character
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -150,7 +143,6 @@
* Set automatically expands the array if it is compacted.
* @param index the character to set the mapped value with
* @param value the new mapped value
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -169,7 +161,6 @@
* @param start the starting offset of the range
* @param end the ending offset of the range
* @param value the new mapped value
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -187,7 +178,6 @@
}
/**
* Compact the array.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -198,7 +188,6 @@
/**
* Compact the array.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -293,7 +282,6 @@
/**
* For internal use only. Do not modify the result, the behavior of
* modified results are undefined.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -306,7 +294,6 @@
/**
* For internal use only. Do not modify the result, the behavior of
* modified results are undefined.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -318,7 +305,6 @@
/**
* Overrides Cloneable
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -341,7 +327,6 @@
* @param obj the compact array object to be compared with this.
* @return true if the current compact array object is the same
* as the compact array object obj; false otherwise.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -363,7 +348,6 @@
/**
* Generates the hash code for the compact array object
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/CompactCharArray.java b/android_icu4j/src/main/java/android/icu/util/CompactCharArray.java
index e37fffb..e542bde 100644
--- a/android_icu4j/src/main/java/android/icu/util/CompactCharArray.java
+++ b/android_icu4j/src/main/java/android/icu/util/CompactCharArray.java
@@ -28,7 +28,6 @@
* array contains the indicies of Unicode characters to the value array.
* @see CompactByteArray
* @author Helena Shih
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -39,7 +38,6 @@
/**
* The total number of Unicode characters.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -49,7 +47,6 @@
/**
* Default constructor for CompactCharArray, the default value of the
* compact array is 0.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -62,7 +59,6 @@
/**
* Constructor for CompactCharArray.
* @param defaultValue the default value of the compact array.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -90,7 +86,6 @@
* @param indexArray the indicies of the compact array.
* @param newValues the values of the compact array.
* @exception IllegalArgumentException If the index is out of range.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -119,7 +114,6 @@
*
* @throws IllegalArgumentException if the index or value array is
* the wrong size.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -135,7 +129,6 @@
* Get the mapped value of a Unicode character.
* @param index the character to get the mapped value with
* @return the mapped value of the given character
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -152,7 +145,6 @@
* Set automatically expands the array if it is compacted.
* @param index the character to set the mapped value with
* @param value the new mapped value
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -171,7 +163,6 @@
* @param start the starting offset of the range
* @param end the ending offset of the range
* @param value the new mapped value
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -189,7 +180,6 @@
}
/**
* Compact the array
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -200,7 +190,6 @@
/**
* Compact the array.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -317,7 +306,6 @@
/**
* For internal use only. Do not modify the result, the behavior of
* modified results are undefined.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -330,7 +318,6 @@
/**
* For internal use only. Do not modify the result, the behavior of
* modified results are undefined.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -342,7 +329,6 @@
/**
* Overrides Cloneable
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -365,7 +351,6 @@
* @param obj the compact array object to be compared with this.
* @return true if the current compact array object is the same
* as the compact array object obj; false otherwise.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -387,7 +372,6 @@
/**
* Generates the hash code for the compact array object
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -428,7 +412,6 @@
}
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/CopticCalendar.java b/android_icu4j/src/main/java/android/icu/util/CopticCalendar.java
index 9432118..ee14797 100644
--- a/android_icu4j/src/main/java/android/icu/util/CopticCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/CopticCalendar.java
@@ -221,7 +221,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -245,7 +244,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -278,7 +276,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -294,8 +291,6 @@
* @param year the year
* @param month the month
* @param date the day
- * {@literal @}draft ICU 3.4 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
// The equivalent operation can be done by public Calendar API.
diff --git a/android_icu4j/src/main/java/android/icu/util/Currency.java b/android_icu4j/src/main/java/android/icu/util/Currency.java
index fcccd7a..e368810 100644
--- a/android_icu4j/src/main/java/android/icu/util/Currency.java
+++ b/android_icu4j/src/main/java/android/icu/util/Currency.java
@@ -619,7 +619,6 @@
* @return the ISO 4217 code, as a string, of the best match, or
* null if there is no match
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/util/DangiCalendar.java b/android_icu4j/src/main/java/android/icu/util/DangiCalendar.java
index 8dc26e1..17d730d 100644
--- a/android_icu4j/src/main/java/android/icu/util/DangiCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/DangiCalendar.java
@@ -15,7 +15,6 @@
* <code>DangiCalendar</code> is a concrete subclass of {@link Calendar}
* that implements a traditional Korean calendar.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -85,7 +84,6 @@
/**
* Construct a <code>DangiCalendar</code> with the default time zone and locale.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -99,7 +97,6 @@
* with the default locale.
* @param date The date to which the new calendar is set.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -115,7 +112,6 @@
* @param zone the given time zone
* @param locale the given locale
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -127,7 +123,6 @@
/**
* {@inheritDoc}
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/DateRule.java b/android_icu4j/src/main/java/android/icu/util/DateRule.java
index b2eb69c..125107b 100644
--- a/android_icu4j/src/main/java/android/icu/util/DateRule.java
+++ b/android_icu4j/src/main/java/android/icu/util/DateRule.java
@@ -20,8 +20,6 @@
* Daylight Savings Time rules, and other events such as meetings.
*
* @see SimpleDateRule
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -38,8 +36,6 @@
* does not occur on or after the start date.
*
* @see #firstBetween
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
abstract public Date firstAfter(Date start);
@@ -56,8 +52,6 @@
* does not occur between the start and end dates.
*
* @see #firstAfter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
abstract public Date firstBetween(Date start, Date end);
@@ -71,8 +65,6 @@
*
* @param date The date to check.
* @return true if this event occurs on the given date.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
abstract public boolean isOn(Date date);
@@ -80,8 +72,6 @@
/**
* Check whether this event occurs at least once between the two
* dates given.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
abstract public boolean isBetween(Date start, Date end);
diff --git a/android_icu4j/src/main/java/android/icu/util/EasterHoliday.java b/android_icu4j/src/main/java/android/icu/util/EasterHoliday.java
index 3b85578..8d5377a 100644
--- a/android_icu4j/src/main/java/android/icu/util/EasterHoliday.java
+++ b/android_icu4j/src/main/java/android/icu/util/EasterHoliday.java
@@ -17,8 +17,6 @@
* A Holiday subclass which represents holidays that occur
* a fixed number of days before or after Easter. Supports both the
* Western and Orthodox methods for calculating Easter.
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -29,8 +27,6 @@
* Construct a holiday that falls on Easter Sunday every year
*
* @param name The name of the holiday
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public EasterHoliday(String name)
@@ -44,8 +40,6 @@
*
* @param daysAfter The number of days before (-) or after (+) Easter
* @param name The name of the holiday
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public EasterHoliday(int daysAfter, String name)
@@ -61,8 +55,6 @@
* @param daysAfter The number of days before (-) or after (+) Easter
* @param orthodox Use the Orthodox calendar?
* @param name The name of the holiday
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public EasterHoliday(int daysAfter, boolean orthodox, String name)
@@ -72,96 +64,72 @@
/**
* Shrove Tuesday, aka Mardi Gras, 48 days before Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday SHROVE_TUESDAY = new EasterHoliday(-48, "Shrove Tuesday");
/**
* Ash Wednesday, start of Lent, 47 days before Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday ASH_WEDNESDAY = new EasterHoliday(-47, "Ash Wednesday");
/**
* Palm Sunday, 7 days before Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday PALM_SUNDAY = new EasterHoliday( -7, "Palm Sunday");
/**
* Maundy Thursday, 3 days before Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday MAUNDY_THURSDAY = new EasterHoliday( -3, "Maundy Thursday");
/**
* Good Friday, 2 days before Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday GOOD_FRIDAY = new EasterHoliday( -2, "Good Friday");
/**
* Easter Sunday
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday EASTER_SUNDAY = new EasterHoliday( 0, "Easter Sunday");
/**
* Easter Monday, 1 day after Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday EASTER_MONDAY = new EasterHoliday( 1, "Easter Monday");
/**
* Ascension, 39 days after Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday ASCENSION = new EasterHoliday( 39, "Ascension");
/**
* Pentecost (aka Whit Sunday), 49 days after Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday PENTECOST = new EasterHoliday( 49, "Pentecost");
/**
* Whit Sunday (aka Pentecost), 49 days after Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday WHIT_SUNDAY = new EasterHoliday( 49, "Whit Sunday");
/**
* Whit Monday, 50 days after Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday WHIT_MONDAY = new EasterHoliday( 50, "Whit Monday");
/**
* Corpus Christi, 60 days after Easter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
static public final EasterHoliday CORPUS_CHRISTI = new EasterHoliday( 60, "Corpus Christi");
diff --git a/android_icu4j/src/main/java/android/icu/util/EthiopicCalendar.java b/android_icu4j/src/main/java/android/icu/util/EthiopicCalendar.java
index 8de610e..3707b1e 100644
--- a/android_icu4j/src/main/java/android/icu/util/EthiopicCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/EthiopicCalendar.java
@@ -268,7 +268,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -296,7 +295,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -333,7 +331,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -347,7 +344,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -363,8 +359,6 @@
* @param month the month
* @param date the day
*
- * {@literal @}draft ICU 3.4 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
// The equivalent operation can be done by public Calendar API.
diff --git a/android_icu4j/src/main/java/android/icu/util/GenderInfo.java b/android_icu4j/src/main/java/android/icu/util/GenderInfo.java
index 6c3020e..b8ed57f 100644
--- a/android_icu4j/src/main/java/android/icu/util/GenderInfo.java
+++ b/android_icu4j/src/main/java/android/icu/util/GenderInfo.java
@@ -21,7 +21,6 @@
/**
* Provide information about gender in locales based on data in CLDR. Currently supplies gender of lists.
* @author markdavis
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -34,28 +33,24 @@
/**
* Gender: OTHER means either the information is unavailable, or the person has declined to state MALE or FEMALE.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
public enum Gender {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
MALE,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
FEMALE,
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -66,7 +61,6 @@
/**
* Create GenderInfo from a ULocale.
* @param uLocale desired locale
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -78,7 +72,6 @@
/**
* Create GenderInfo from a Locale.
* @param locale desired locale
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -91,7 +84,6 @@
* Enum only meant for use in CLDR and in testing. Indicates the category for the locale.
* This only affects gender for lists more than one. For lists of 1 item, the gender
* of the list always equals the gender of that sole item.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -101,7 +93,6 @@
* For an empty list, returns OTHER;
* For a single item, returns its gender;
* Otherwise always OTHER.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -112,7 +103,6 @@
* For a single item, returns its gender;
* Otherwise gender(all male) = male, gender(all female) = female, otherwise gender(list) = other.
* So any 'other' value makes the overall gender be 'other'.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -123,7 +113,6 @@
* For a single item, returns its gender;
* Otherwise, gender(all female) = female, otherwise gender(list) = male.
* So for more than one item, any 'other' value makes the overall gender be 'male'.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -140,7 +129,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -158,7 +146,6 @@
* Get the gender of a list, based on locale usage.
* @param genders a list of genders.
* @return the gender of the list.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -171,7 +158,6 @@
* Get the gender of a list, based on locale usage.
* @param genders a list of genders.
* @return the gender of the list.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -224,7 +210,6 @@
/**
* Only for testing and use with CLDR.
* @param genderStyle gender style
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/GlobalizationPreferences.java b/android_icu4j/src/main/java/android/icu/util/GlobalizationPreferences.java
index c7d7b9d..e55c7c5 100644
--- a/android_icu4j/src/main/java/android/icu/util/GlobalizationPreferences.java
+++ b/android_icu4j/src/main/java/android/icu/util/GlobalizationPreferences.java
@@ -73,8 +73,6 @@
* locale that will ask the services to use the host platform's values).</li>
* </ul>
*
- * {@literal @}draft ICU 3.6 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -91,15 +89,11 @@
/**
* Default constructor
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences(){}
/**
* Number Format type
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final int
@@ -113,8 +107,6 @@
/**
* Date Format type
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final int
@@ -128,8 +120,6 @@
/**
* For selecting a choice of display names
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final int
@@ -148,8 +138,6 @@
/**
* Break iterator type
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final int
@@ -171,8 +159,6 @@
* @param inputLocales list of locales in priority order, eg {"be", "fr"}
* for Breton first, then French if that fails.
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setLocales(List<ULocale> inputLocales) {
@@ -187,8 +173,6 @@
* Get a copy of the language/locale priority list
*
* @return a copy of the language/locale priority list.
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public List<ULocale> getLocales() {
@@ -206,8 +190,6 @@
* Convenience function for getting the locales in priority order
* @param index The index (0..n) of the desired item.
* @return desired item. null if index is out of range
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public ULocale getLocale(int index) {
@@ -228,8 +210,6 @@
* @see #setLocales(List locales)
* @param uLocales list of locales in an array
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setLocales(ULocale[] uLocales) {
@@ -246,8 +226,6 @@
* @see #setLocales(List locales)
* @param uLocale single locale
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setLocale(ULocale uLocale) {
@@ -264,8 +242,6 @@
* @param acceptLanguageString Accept-Language list, as defined by
* Section 14.4 of the RFC 2616 (HTTP 1.1)
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setLocales(String acceptLanguageString) {
@@ -291,8 +267,6 @@
* class name
* @return a resource bundle for the given base name and locale based on the
* language/locale priority list stored in this object
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public ResourceBundle getResourceBundle(String baseName) {
@@ -309,8 +283,6 @@
* @param loader the class object from which to load the resource bundle
* @return a resource bundle for the given base name and locale based on the
* language/locale priority list stored in this object
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public ResourceBundle getResourceBundle(String baseName, ClassLoader loader) {
@@ -365,8 +337,6 @@
*
* @param territory code
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setTerritory(String territory) {
@@ -382,8 +352,6 @@
* computed from the general locale setting.
*
* @return territory code, explicit or implicit.
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String getTerritory() {
@@ -398,8 +366,6 @@
*
* @param currency Valid ISO 4217 currency code.
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setCurrency(Currency currency) {
@@ -414,8 +380,6 @@
* Get a copy of the currency computed according to the settings.
*
* @return currency code, explicit or implicit.
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Currency getCurrency() {
@@ -430,8 +394,6 @@
*
* @param calendar arbitrary calendar
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setCalendar(Calendar calendar) {
@@ -446,8 +408,6 @@
* Get a copy of the calendar according to the settings.
*
* @return calendar explicit or implicit.
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Calendar getCalendar() {
@@ -465,8 +425,6 @@
*
* @param timezone a valid TZID (see UTS#35).
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setTimeZone(TimeZone timezone) {
@@ -482,8 +440,6 @@
* heuristically computed from other settings.
*
* @return timezone, either implicitly or explicitly set
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public TimeZone getTimeZone() {
@@ -497,8 +453,6 @@
* Get a copy of the collator according to the settings.
*
* @return collator explicit or implicit.
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Collator getCollator() {
@@ -516,8 +470,6 @@
* Explicitly set the collator for this object.
* @param collator The collator object to be passed.
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setCollator(Collator collator) {
@@ -538,8 +490,6 @@
*
* @param type break type - BI_CHARACTER or BI_WORD, BI_LINE, BI_SENTENCE, BI_TITLE
* @return break iterator explicit or implicit
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public BreakIterator getBreakIterator(int type) {
@@ -558,8 +508,6 @@
* @param type break type - BI_CHARACTER or BI_WORD, BI_LINE, BI_SENTENCE, BI_TITLE
* @param iterator a break iterator
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setBreakIterator(int type, BreakIterator iterator) {
@@ -582,8 +530,6 @@
* @param id language code, script code, ...
* @param type specifies the type of the ID: ID_LANGUAGE, etc.
* @return the display name
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String getDisplayName(String id, int type) {
@@ -687,8 +633,6 @@
* @param timeStyle DF_FULL, DF_LONG, DF_MEDIUM, DF_SHORT or DF_NONE
* @param format The date format
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setDateFormat(int dateStyle, int timeStyle, DateFormat format) {
@@ -712,8 +656,6 @@
* @param dateStyle DF_FULL, DF_LONG, DF_MEDIUM, DF_SHORT or DF_NONE
* @param timeStyle DF_FULL, DF_LONG, DF_MEDIUM, DF_SHORT or DF_NONE
* @return a DateFormat, according to the above description
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public DateFormat getDateFormat(int dateStyle, int timeStyle) {
@@ -743,8 +685,6 @@
* used.
*
* @param style NF_NUMBER, NF_CURRENCY, NF_PERCENT, NF_SCIENTIFIC, NF_INTEGER
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public NumberFormat getNumberFormat(int style) {
@@ -769,8 +709,6 @@
* @param style NF_NUMBER, NF_CURRENCY, NF_PERCENT, NF_SCIENTIFIC, NF_INTEGER
* @param format The number format
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences setNumberFormat(int style, NumberFormat format) {
@@ -788,8 +726,6 @@
* Restore the object to the initial state.
*
* @return this, for chaining
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences reset() {
@@ -844,8 +780,6 @@
* to customize the algorithm used for populating the locale list.
*
* @param inputLocales The list of input locales
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected List<ULocale> processLocales(List<ULocale> inputLocales) {
@@ -976,8 +910,6 @@
*
* @param dateStyle
* @param timeStyle
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected DateFormat guessDateFormat(int dateStyle, int timeStyle) {
@@ -1002,8 +934,6 @@
* one whose modification will not affect this object.</b>
*
* @param style
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected NumberFormat guessNumberFormat(int style) {
@@ -1038,8 +968,6 @@
/**
* This function can be overridden by subclasses to use different heuristics.
*
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected String guessTerritory() {
@@ -1074,8 +1002,6 @@
/**
* This function can be overridden by subclasses to use different heuristics
*
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected Currency guessCurrency() {
@@ -1087,8 +1013,6 @@
* <b>It MUST return a 'safe' value,
* one whose modification will not affect this object.</b>
*
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected List<ULocale> guessLocales() {
@@ -1105,8 +1029,6 @@
* <b>It MUST return a 'safe' value,
* one whose modification will not affect this object.</b>
*
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected Collator guessCollator() {
@@ -1123,8 +1045,6 @@
* one whose modification will not affect this object.</b>
*
* @param type
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected BreakIterator guessBreakIterator(int type) {
@@ -1160,8 +1080,6 @@
* <b>It MUST return a 'safe' value,
* one whose modification will not affect this object.</b>
*
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected TimeZone guessTimeZone() {
@@ -1195,8 +1113,6 @@
* <b>It MUST return a 'safe' value,
* one whose modification will not affect this object.</b>
*
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected Calendar guessCalendar() {
@@ -1524,8 +1440,6 @@
private volatile boolean frozen;
/**
- * {@literal @}draft ICU 3.6
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isFrozen() {
@@ -1533,8 +1447,6 @@
}
/**
- * {@literal @}draft ICU 4.4
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences freeze() {
@@ -1543,8 +1455,6 @@
}
/**
- * {@literal @}draft ICU 4.4
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public GlobalizationPreferences cloneAsThawed() {
diff --git a/android_icu4j/src/main/java/android/icu/util/GregorianCalendar.java b/android_icu4j/src/main/java/android/icu/util/GregorianCalendar.java
index 41f1609..1a17d22 100644
--- a/android_icu4j/src/main/java/android/icu/util/GregorianCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/GregorianCalendar.java
@@ -12,7 +12,7 @@
import android.icu.util.ULocale.Category;
/**
- * {{@literal @}icuenhanced java.util.GregorianCalendar}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.GregorianCalendar}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p><code>GregorianCalendar</code> is a concrete subclass of
* {@link Calendar}
@@ -353,7 +353,7 @@
}
/**
- * {{@literal @}icu} Constructs a GregorianCalendar based on the current time
+ * <strong>[icu]</strong> Constructs a GregorianCalendar based on the current time
* in the default time zone with the given locale.
* @param locale the given ulocale.
*/
@@ -362,7 +362,7 @@
}
/**
- * {{@literal @}icu} Constructs a GregorianCalendar based on the current time
+ * <strong>[icu]</strong> Constructs a GregorianCalendar based on the current time
* in the given time zone with the given locale.
* @param zone the given time zone.
* @param aLocale the given locale.
diff --git a/android_icu4j/src/main/java/android/icu/util/HebrewCalendar.java b/android_icu4j/src/main/java/android/icu/util/HebrewCalendar.java
index 7101d5c..977bc0d 100644
--- a/android_icu4j/src/main/java/android/icu/util/HebrewCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/HebrewCalendar.java
@@ -660,7 +660,6 @@
*
* The rule here is that if (year % 19) == 0, 3, 6, 8, 11, 14, or 17.
* The formula below performs the same test, believe it or not.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -728,7 +727,6 @@
* <p>
* Overrides {@link Calendar#validateField(int)} to provide
* special handling for month validation for Hebrew calendar.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/util/HebrewHoliday.java b/android_icu4j/src/main/java/android/icu/util/HebrewHoliday.java
index 530a8f0..37e77f5 100644
--- a/android_icu4j/src/main/java/android/icu/util/HebrewHoliday.java
+++ b/android_icu4j/src/main/java/android/icu/util/HebrewHoliday.java
@@ -12,8 +12,6 @@
* <b>Note:</b> The Holiday framework is a technology preview.
* Despite its age, is still draft API, and clients should treat it as such.
*
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -26,8 +24,6 @@
* Construct a holiday defined in reference to the Hebrew calendar.
*
* @param name The name of the holiday
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public HebrewHoliday(int month, int date, String name)
@@ -36,8 +32,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public HebrewHoliday(int month, int date, int length, String name)
@@ -46,169 +40,121 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday ROSH_HASHANAH = new HebrewHoliday(HebrewCalendar.TISHRI, 1, 2, "Rosh Hashanah");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday GEDALIAH = new HebrewHoliday(HebrewCalendar.TISHRI, 3, "Fast of Gedaliah");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday YOM_KIPPUR = new HebrewHoliday(HebrewCalendar.TISHRI, 10, "Yom Kippur");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday SUKKOT = new HebrewHoliday(HebrewCalendar.TISHRI, 15, 6, "Sukkot");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday HOSHANAH_RABBAH = new HebrewHoliday(HebrewCalendar.TISHRI, 21, "Hoshanah Rabbah");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday SHEMINI_ATZERET = new HebrewHoliday(HebrewCalendar.TISHRI, 22, "Shemini Atzeret");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday SIMCHAT_TORAH = new HebrewHoliday(HebrewCalendar.TISHRI, 23, "Simchat Torah");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday HANUKKAH = new HebrewHoliday(HebrewCalendar.KISLEV, 25, "Hanukkah");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday TEVET_10 = new HebrewHoliday(HebrewCalendar.TEVET, 10, "Fast of Tevet 10");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday TU_BSHEVAT = new HebrewHoliday(HebrewCalendar.SHEVAT, 15, "Tu B'Shevat");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday ESTHER = new HebrewHoliday(HebrewCalendar.ADAR, 13, "Fast of Esther");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday PURIM = new HebrewHoliday(HebrewCalendar.ADAR, 14, "Purim");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday SHUSHAN_PURIM = new HebrewHoliday(HebrewCalendar.ADAR, 15, "Shushan Purim");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday PASSOVER = new HebrewHoliday(HebrewCalendar.NISAN, 15, 8, "Passover");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday YOM_HASHOAH = new HebrewHoliday(HebrewCalendar.NISAN, 27, "Yom Hashoah");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday YOM_HAZIKARON = new HebrewHoliday(HebrewCalendar.IYAR, 4, "Yom Hazikaron");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday YOM_HAATZMAUT = new HebrewHoliday(HebrewCalendar.IYAR, 5, "Yom Ha'Atzmaut");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday PESACH_SHEINI = new HebrewHoliday(HebrewCalendar.IYAR, 14, "Pesach Sheini");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday LAG_BOMER = new HebrewHoliday(HebrewCalendar.IYAR, 18, "Lab B'Omer");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday YOM_YERUSHALAYIM = new HebrewHoliday(HebrewCalendar.IYAR, 28, "Yom Yerushalayim");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday SHAVUOT = new HebrewHoliday(HebrewCalendar.SIVAN, 6, 2, "Shavuot");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday TAMMUZ_17 = new HebrewHoliday(HebrewCalendar.TAMUZ, 17, "Fast of Tammuz 17");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday TISHA_BAV = new HebrewHoliday(HebrewCalendar.AV, 9, "Fast of Tisha B'Av");
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static HebrewHoliday SELIHOT = new HebrewHoliday(HebrewCalendar.ELUL, 21, "Selihot");
diff --git a/android_icu4j/src/main/java/android/icu/util/Holiday.java b/android_icu4j/src/main/java/android/icu/util/Holiday.java
index 73291a4..b4e9dd1 100644
--- a/android_icu4j/src/main/java/android/icu/util/Holiday.java
+++ b/android_icu4j/src/main/java/android/icu/util/Holiday.java
@@ -20,8 +20,6 @@
* Despite its age, is still draft API, and clients should treat it as such.
*
* An abstract class representing a holiday.
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -29,8 +27,6 @@
public abstract class Holiday implements DateRule
{
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static Holiday[] getHolidays()
@@ -39,8 +35,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static Holiday[] getHolidays(Locale locale)
@@ -49,8 +43,6 @@
}
/**
- * {@literal @}draft ICU 3.2
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static Holiday[] getHolidays(ULocale locale)
@@ -76,8 +68,6 @@
* does not occur on or after the start date.
*
* @see #firstBetween
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Date firstAfter(Date start) {
@@ -95,8 +85,6 @@
* does not occur between the start and end dates.
*
* @see #firstAfter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Date firstBetween(Date start, Date end) {
@@ -110,8 +98,6 @@
*
* @param date The date to check.
* @return true if this holiday occurs on the given date.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isOn(Date date) {
@@ -122,8 +108,6 @@
/**
* Check whether this holiday occurs at least once between the two
* dates given.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isBetween(Date start, Date end) {
@@ -141,8 +125,6 @@
* @param rule The date rules used for determining when this holiday
* falls. Holiday's implementation of the DateRule interface
* simply delegates to this DateRule object.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
protected Holiday(String name, DateRule rule)
@@ -154,8 +136,6 @@
/**
* Return the name of this holiday in the language of the default <code>DISPLAY</code> locale.
* @see Category#DISPLAY
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String getDisplayName() {
@@ -171,8 +151,6 @@
* @param locale A locale specifying the language in which the name is desired.
*
* @see ResourceBundle
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String getDisplayName(Locale locale)
@@ -189,8 +167,6 @@
* @param locale A locale specifying the language in which the name is desired.
*
* @see ResourceBundle
- * {@literal @}draft ICU 3.2
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public String getDisplayName(ULocale locale)
@@ -207,8 +183,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public DateRule getRule() {
@@ -216,8 +190,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public void setRule(DateRule rule) {
diff --git a/android_icu4j/src/main/java/android/icu/util/IslamicCalendar.java b/android_icu4j/src/main/java/android/icu/util/IslamicCalendar.java
index b06bac4..91994e5 100644
--- a/android_icu4j/src/main/java/android/icu/util/IslamicCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/IslamicCalendar.java
@@ -916,8 +916,6 @@
/**
* sets the calculation type for this calendar.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public void setCalculationType(CalculationType type) {
@@ -933,8 +931,6 @@
/**
* gets the calculation type for this calendar.
*
- * {@literal @}draft ICU 55
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public CalculationType getCalculationType() {
diff --git a/android_icu4j/src/main/java/android/icu/util/JapaneseCalendar.java b/android_icu4j/src/main/java/android/icu/util/JapaneseCalendar.java
index 935020b..d7fa3e7 100644
--- a/android_icu4j/src/main/java/android/icu/util/JapaneseCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/JapaneseCalendar.java
@@ -222,8 +222,6 @@
* taking year and era into account. Defaults to 0 (JANUARY) for Gregorian.
* @param extendedYear the extendedYear, as returned by handleGetExtendedYear
* @return the default month
- * {@literal @}provisional ICU 3.6
- * {@literal @}draft ICU 3.6 (retain)
* @see #MONTH
* @hide draft / provisional / internal are hidden on Android
*/
@@ -247,8 +245,6 @@
* @param extendedYear the extendedYear, as returned by handleGetExtendedYear
* @param month the month, as returned by getDefaultMonthInYear
* @return the default day of the month
- * {@literal @}draft ICU 3.6 (retain)
- * {@literal @}provisional ICU 3.6
* @see #DAY_OF_MONTH
* @hide draft / provisional / internal are hidden on Android
*/
@@ -622,7 +618,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
diff --git a/android_icu4j/src/main/java/android/icu/util/LocaleMatcher.java b/android_icu4j/src/main/java/android/icu/util/LocaleMatcher.java
index 17d970b..8d8a79e 100644
--- a/android_icu4j/src/main/java/android/icu/util/LocaleMatcher.java
+++ b/android_icu4j/src/main/java/android/icu/util/LocaleMatcher.java
@@ -52,7 +52,6 @@
public class LocaleMatcher {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -104,7 +103,6 @@
* Internal testing function; may expose API later.
* @param languagePriorityList LocalePriorityList to match
* @param matcherData Internal matching data
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -117,7 +115,6 @@
* Internal testing function; may expose API later.
* @param languagePriorityList LocalePriorityList to match
* @param matcherData Internal matching data
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -222,7 +219,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -288,7 +284,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -595,7 +590,6 @@
/**
* Only for testing and use by tools. Interface may change!!
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -609,7 +603,6 @@
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -618,7 +611,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -628,7 +620,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -638,7 +629,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -673,7 +663,6 @@
* symmetric. We don't bother producing an equivalence class because there are
* so few cases; this function depends on the other permutations being
* added specifically.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -683,7 +672,6 @@
return addDistance(desired, supported, percent, false, null);
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -692,7 +680,6 @@
return addDistance(desired, supported, percent, false, comment);
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -761,7 +748,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -782,7 +768,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -798,7 +783,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -840,7 +824,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -854,7 +837,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
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 49d112d..0858464 100644
--- a/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
+++ b/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
@@ -45,7 +45,6 @@
= new HashMap<String, Map<String,MeasureUnit>>();
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -54,7 +53,6 @@
protected final String type;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -63,7 +61,6 @@
protected final String subType;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -164,7 +161,6 @@
* available for it, and it may not be returned by getAvailable().
* However, for special purposes (such as CLDR tooling), it is available.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -192,7 +188,6 @@
/**
* For ICU use only.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -206,7 +201,6 @@
static final UnicodeSet ASCII_HYPHEN_DIGITS = new UnicodeSet('-', '-', '0', '9', 'a', 'z').freeze();
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -214,7 +208,6 @@
@Deprecated
protected interface Factory {
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -290,7 +283,6 @@
// Must only be called at static initialization, or inside synchronized block.
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -356,8 +348,6 @@
/**
* Constant for unit of angle: revolution
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit REVOLUTION_ANGLE = MeasureUnit.internalGetInstance("angle", "revolution");
@@ -409,8 +399,6 @@
/**
* Constant for unit of consumption: liter-per-100kilometers
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit LITER_PER_100KILOMETERS = MeasureUnit.internalGetInstance("consumption", "liter-per-100kilometers");
@@ -477,8 +465,6 @@
/**
* Constant for unit of duration: century
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit CENTURY = MeasureUnit.internalGetInstance("duration", "century");
@@ -665,8 +651,6 @@
/**
* Constant for unit of length: mile-scandinavian
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit MILE_SCANDINAVIAN = MeasureUnit.internalGetInstance("length", "mile-scandinavian");
@@ -828,8 +812,6 @@
/**
* Constant for unit of speed: knot
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit KNOT = MeasureUnit.internalGetInstance("speed", "knot");
@@ -856,8 +838,6 @@
/**
* Constant for unit of temperature: generic
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit GENERIC_TEMPERATURE = MeasureUnit.internalGetInstance("temperature", "generic");
@@ -924,8 +904,6 @@
/**
* Constant for unit of volume: cup-metric
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit CUP_METRIC = MeasureUnit.internalGetInstance("volume", "cup-metric");
@@ -972,8 +950,6 @@
/**
* Constant for unit of volume: pint-metric
- * {@literal @}draft ICU 56
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final MeasureUnit PINT_METRIC = MeasureUnit.internalGetInstance("volume", "pint-metric");
diff --git a/android_icu4j/src/main/java/android/icu/util/OutputInt.java b/android_icu4j/src/main/java/android/icu/util/OutputInt.java
index 10d24d3..ee9ddaf 100644
--- a/android_icu4j/src/main/java/android/icu/util/OutputInt.java
+++ b/android_icu4j/src/main/java/android/icu/util/OutputInt.java
@@ -11,7 +11,6 @@
* Simple struct-like class for int output parameters.
* Like <code>Output<Integer></code> but without auto-boxing.
*
- * {@literal @}internal but could become public
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -22,7 +21,6 @@
/**
* The value field.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -32,7 +30,6 @@
/**
* Constructs an <code>OutputInt</code> with value 0.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -44,7 +41,6 @@
* Constructs an <code>OutputInt</code> with the given value.
*
* @param value the initial value
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -55,7 +51,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/OverlayBundle.java b/android_icu4j/src/main/java/android/icu/util/OverlayBundle.java
index 85e06f9..3be3221 100644
--- a/android_icu4j/src/main/java/android/icu/util/OverlayBundle.java
+++ b/android_icu4j/src/main/java/android/icu/util/OverlayBundle.java
@@ -60,7 +60,6 @@
*
* @see java.util.ResourceBundle
* @author Alan Liu
- * {@literal @}internal
* @deprecated ICU 2.4. This class may be removed or modified.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -91,7 +90,6 @@
/**
* Construct an overlay bundle given a sequence of base names and
* a locale.
- * {@literal @}internal
* @deprecated ICU 2.4. This class may be removed or modified.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -106,7 +104,6 @@
/**
* ResourceBundle framework method. Delegates to
* bundles[i].getObject().
- * {@literal @}internal
* @deprecated ICU 2.4. This class may be removed or modified.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -136,7 +133,6 @@
/**
* ResourceBundle framework method. Delegates to
* bundles[bundles.length-1].getKeys().
- * {@literal @}internal
* @deprecated ICU 2.4. This class may be removed or modified.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/PersianCalendar.java b/android_icu4j/src/main/java/android/icu/util/PersianCalendar.java
index ef96e24..8d0de82 100644
--- a/android_icu4j/src/main/java/android/icu/util/PersianCalendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/PersianCalendar.java
@@ -60,7 +60,6 @@
*
* @author Roozbeh Pournader
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
@@ -104,7 +103,6 @@
* in the default time zone with the default <code>FORMAT</code> locale.
* @see Category#FORMAT
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -120,7 +118,6 @@
* @param zone the given time zone.
* @see Category#FORMAT
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -136,7 +133,6 @@
*
* @param aLocale the given locale.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -152,7 +148,6 @@
*
* @param locale the given ulocale.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -169,7 +164,6 @@
* @param zone the given time zone.
* @param aLocale the given locale.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -187,7 +181,6 @@
* @param zone the given time zone.
* @param locale the given ulocale.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -205,7 +198,6 @@
* @param date The date to which the new calendar is set.
* @see Category#FORMAT
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -225,7 +217,6 @@
* @param date the value used to set the {@link #DATE DATE} time field in the calendar.
* @see Category#FORMAT
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -254,7 +245,6 @@
* in the calendar.
* @see Category#FORMAT
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -303,7 +293,6 @@
};
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -337,7 +326,6 @@
* @param extendedYear The Persian year
* @param month The Persian month, 0-based
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -357,7 +345,6 @@
/**
* Return the number of days in the given Persian year
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -373,7 +360,6 @@
/**
* Return JD of start of given month/year
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -399,7 +385,6 @@
//-------------------------------------------------------------------------
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -428,7 +413,6 @@
* The DAY_OF_WEEK and DOW_LOCAL fields are already set when this
* method is called.
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -460,7 +444,6 @@
/**
* {@inheritDoc}
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/RangeDateRule.java b/android_icu4j/src/main/java/android/icu/util/RangeDateRule.java
index 206e2fd..5259c0d 100644
--- a/android_icu4j/src/main/java/android/icu/util/RangeDateRule.java
+++ b/android_icu4j/src/main/java/android/icu/util/RangeDateRule.java
@@ -17,16 +17,12 @@
* Despite its age, is still draft API, and clients should treat it as such.
*
* Implementation of DateRule that takes a range.
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
*/
public class RangeDateRule implements DateRule {
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public RangeDateRule() {
@@ -41,8 +37,6 @@
// }
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public void add(DateRule rule) {
@@ -50,8 +44,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public void add(Date start, DateRule rule) {
@@ -63,8 +55,6 @@
//-----------------------------------------------------------------------
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Date firstAfter(Date start) {
@@ -90,8 +80,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Date firstBetween(Date start, Date end) {
@@ -120,8 +108,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isOn(Date date) {
@@ -132,8 +118,6 @@
/**
* Check whether this event occurs at least once between the two
* dates given.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isBetween(Date start, Date end) {
diff --git a/android_icu4j/src/main/java/android/icu/util/RuleBasedTimeZone.java b/android_icu4j/src/main/java/android/icu/util/RuleBasedTimeZone.java
index ab959ca..2678b8f 100644
--- a/android_icu4j/src/main/java/android/icu/util/RuleBasedTimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/RuleBasedTimeZone.java
@@ -110,7 +110,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/SimpleDateRule.java b/android_icu4j/src/main/java/android/icu/util/SimpleDateRule.java
index 9e61f53..919a6cd 100644
--- a/android_icu4j/src/main/java/android/icu/util/SimpleDateRule.java
+++ b/android_icu4j/src/main/java/android/icu/util/SimpleDateRule.java
@@ -15,8 +15,6 @@
* Despite its age, is still draft API, and clients should treat it as such.
*
* Simple implementation of DateRule.
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -28,8 +26,6 @@
*
* @param month The month in which this rule occurs (0-based).
* @param dayOfMonth The date in that month (1-based).
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleDateRule(int month, int dayOfMonth)
@@ -57,8 +53,6 @@
* @param after If true, this rule selects the first dayOfWeek
* on or after dayOfMonth. If false, the rule selects
* the first dayOfWeek on or before dayOfMonth.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleDateRule(int month, int dayOfMonth, int dayOfWeek, boolean after)
@@ -78,8 +72,6 @@
* does not occur on or after the start date.
*
* @see #firstBetween
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Date firstAfter(Date start)
@@ -99,8 +91,6 @@
* does not occur between the start and end dates.
*
* @see #firstAfter
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public Date firstBetween(Date start, Date end)
@@ -118,8 +108,6 @@
*
* @param date The date to check.
* @return true if this event occurs on the given date.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isOn(Date date)
@@ -143,8 +131,6 @@
/**
* Check whether this event occurs at least once between the two
* dates given.
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public boolean isBetween(Date start, Date end)
@@ -222,8 +208,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
// public void setCalendar(Calendar c) {
diff --git a/android_icu4j/src/main/java/android/icu/util/SimpleHoliday.java b/android_icu4j/src/main/java/android/icu/util/SimpleHoliday.java
index 35269a6..eeb7fc4 100644
--- a/android_icu4j/src/main/java/android/icu/util/SimpleHoliday.java
+++ b/android_icu4j/src/main/java/android/icu/util/SimpleHoliday.java
@@ -17,8 +17,6 @@
* A holiday whose date can be represented by a month, day, and optionally day of week
* in the Gregorian calendar.
*
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide Only a subset of ICU is exposed in Android
* @hide draft / provisional / internal are hidden on Android
* @hide All android.icu classes are currently hidden
@@ -36,8 +34,6 @@
* getDisplayName will return this string instead.
*
* @see Holiday#getDisplayName(java.util.Locale)
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleHoliday(int month, int dayOfMonth, String name)
@@ -57,8 +53,6 @@
* getDisplayName will return this string instead.
*
* @see Holiday#getDisplayName(java.util.Locale)
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleHoliday(int month, int dayOfMonth, String name,
@@ -79,8 +73,6 @@
* getDisplayName will return this string instead.
*
* @see Holiday#getDisplayName(java.util.Locale)
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleHoliday(int month, int dayOfMonth, String name,
@@ -111,8 +103,6 @@
* getDisplayName will return this string instead.
*
* @see Holiday#getDisplayName(java.util.Locale)
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name)
@@ -123,8 +113,6 @@
}
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name,
@@ -138,8 +126,6 @@
/**
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name,
@@ -178,8 +164,6 @@
/**
* New Year's Day - January 1st
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday NEW_YEARS_DAY =
@@ -187,8 +171,6 @@
/**
* Epiphany, January 6th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday EPIPHANY =
@@ -196,8 +178,6 @@
/**
* May Day, May 1st
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday MAY_DAY =
@@ -205,8 +185,6 @@
/**
* Assumption, August 15th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday ASSUMPTION =
@@ -214,8 +192,6 @@
/**
* All Saints' Day, November 1st
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday ALL_SAINTS_DAY =
@@ -223,8 +199,6 @@
/**
* All Souls' Day, November 1st
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday ALL_SOULS_DAY =
@@ -232,8 +206,6 @@
/**
* Immaculate Conception, December 8th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday IMMACULATE_CONCEPTION =
@@ -241,8 +213,6 @@
/**
* Christmas Eve, December 24th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday CHRISTMAS_EVE =
@@ -250,8 +220,6 @@
/**
* Christmas, December 25th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday CHRISTMAS =
@@ -259,8 +227,6 @@
/**
* Boxing Day, December 26th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday BOXING_DAY =
@@ -268,8 +234,6 @@
/**
* Saint Stephen's Day, December 26th
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday ST_STEPHENS_DAY =
@@ -277,8 +241,6 @@
/**
* New Year's Eve, December 31st
- * {@literal @}draft ICU 2.8
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final SimpleHoliday NEW_YEARS_EVE =
diff --git a/android_icu4j/src/main/java/android/icu/util/SimpleTimeZone.java b/android_icu4j/src/main/java/android/icu/util/SimpleTimeZone.java
index db9bfa2..a393051 100644
--- a/android_icu4j/src/main/java/android/icu/util/SimpleTimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/SimpleTimeZone.java
@@ -12,7 +12,7 @@
import android.icu.impl.Grego;
/**
- * {{@literal @}icuenhanced java.util.SimpleTimeZone}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.SimpleTimeZone}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p><code>SimpleTimeZone</code> is a concrete subclass of <code>TimeZone</code>
* that represents a time zone for use with a Gregorian calendar. This
@@ -637,7 +637,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -767,7 +766,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/StringTokenizer.java b/android_icu4j/src/main/java/android/icu/util/StringTokenizer.java
index 1a435c4..bba9a17 100644
--- a/android_icu4j/src/main/java/android/icu/util/StringTokenizer.java
+++ b/android_icu4j/src/main/java/android/icu/util/StringTokenizer.java
@@ -15,7 +15,7 @@
import android.icu.text.UnicodeSet;
/**
- * {{@literal @}icuenhanced java.util.Calendar}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.Calendar}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>The string tokenizer class allows an application to break a string
* into tokens by performing code point comparison.
@@ -107,7 +107,7 @@
// public constructors ---------------------------------------------
/**
- * {{@literal @}icu} Constructs a string tokenizer for the specified string. All
+ * <strong>[icu]</strong> Constructs a string tokenizer for the specified string. All
* characters in the delim argument are the delimiters for separating
* tokens.
* <p>If the returnDelims flag is false, the delimiter characters are
@@ -126,7 +126,7 @@
}
/**
- * {{@literal @}icu} Constructs a string tokenizer for the specified string. All
+ * <strong>[icu]</strong> Constructs a string tokenizer for the specified string. All
* characters in the delim argument are the delimiters for separating
* tokens.
* <p>If the returnDelims flag is false, the delimiter characters are
@@ -144,7 +144,6 @@
* delimiters as a single token or as one token per delimiter.
* This only takes effect if returndelims is true.
* @exception NullPointerException if str is null
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -176,7 +175,7 @@
}
/**
- * {{@literal @}icu} Constructs a string tokenizer for the specified string. The
+ * <strong>[icu]</strong> Constructs a string tokenizer for the specified string. The
* characters in the delim argument are the delimiters for separating
* tokens.
* <p>Delimiter characters themselves will not be treated as tokens.</p>
@@ -227,7 +226,6 @@
* delimiters as a single token or as one token per delimiter.
* This only takes effect if returndelims is true.
* @exception NullPointerException if str is null
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -406,7 +404,7 @@
}
/**
- * {{@literal @}icu} Returns the next token in this string tokenizer's string. First,
+ * <strong>[icu]</strong> Returns the next token in this string tokenizer's string. First,
* the set of characters considered to be delimiters by this
* <tt>StringTokenizer</tt> object is changed to be the characters in
* the string <tt>delim</tt>. Then the next token in the string
diff --git a/android_icu4j/src/main/java/android/icu/util/StringTrieBuilder.java b/android_icu4j/src/main/java/android/icu/util/StringTrieBuilder.java
index 7395feb..2262dae 100644
--- a/android_icu4j/src/main/java/android/icu/util/StringTrieBuilder.java
+++ b/android_icu4j/src/main/java/android/icu/util/StringTrieBuilder.java
@@ -44,7 +44,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -52,7 +51,6 @@
protected StringTrieBuilder() {}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -74,7 +72,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -120,7 +117,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -818,7 +814,6 @@
}
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -826,21 +821,18 @@
protected abstract boolean matchNodesCanHaveValues() /*const*/;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
protected abstract int getMaxBranchLinearSubNodeLength() /*const*/;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
protected abstract int getMinLinearMatch() /*const*/;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -848,35 +840,30 @@
protected abstract int getMaxLinearMatchLength() /*const*/;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
protected abstract int write(int unit);
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
protected abstract int write(int offset, int length);
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
protected abstract int writeValueAndFinal(int i, boolean isFinal);
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@Deprecated
protected abstract int writeValueAndType(boolean hasValue, int value, int node);
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -890,7 +877,6 @@
// Strings and sub-strings for linear-match nodes.
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
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 d288d15..d72d965 100644
--- a/android_icu4j/src/main/java/android/icu/util/TimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
@@ -29,7 +29,7 @@
import android.icu.util.ULocale.Category;
/**
- * {{@literal @}icuenhanced java.util.TimeZone}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.TimeZone}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p><code>TimeZone</code> represents a time zone offset, and also computes daylight
* savings.
@@ -131,7 +131,6 @@
/**
* Constructing a TimeZone with the given time zone ID.
* @param ID the time zone ID.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -145,13 +144,13 @@
}
/**
- * {{@literal @}icu} A time zone implementation type indicating ICU's own TimeZone used by
+ * <strong>[icu]</strong> A time zone implementation type indicating ICU's own TimeZone used by
* <code>getTimeZone</code>, <code>setDefaultTimeZoneType</code>
* and <code>getDefaultTimeZoneType</code>.
*/
public static final int TIMEZONE_ICU = 0;
/**
- * {{@literal @}icu} A time zone implementation type indicating JDK TimeZone used by
+ * <strong>[icu]</strong> A time zone implementation type indicating JDK TimeZone used by
* <code>getTimeZone</code>, <code>setDefaultTimeZoneType</code>
* and <code>getDefaultTimeZoneType</code>.
*/
@@ -172,35 +171,35 @@
public static final int LONG = 1;
/**
- * {{@literal @}icu} A style specifier for <code>getDisplayName()</code> indicating
+ * <strong>[icu]</strong> A style specifier for <code>getDisplayName()</code> indicating
* a short generic name, such as "PT."
* @see #LONG_GENERIC
*/
public static final int SHORT_GENERIC = 2;
/**
- * {{@literal @}icu} A style specifier for <code>getDisplayName()</code> indicating
+ * <strong>[icu]</strong> A style specifier for <code>getDisplayName()</code> indicating
* a long generic name, such as "Pacific Time."
* @see #SHORT_GENERIC
*/
public static final int LONG_GENERIC = 3;
/**
- * {{@literal @}icu} A style specifier for <code>getDisplayName()</code> indicating
+ * <strong>[icu]</strong> A style specifier for <code>getDisplayName()</code> indicating
* a short name derived from the timezone's offset, such as "-0800."
* @see #LONG_GMT
*/
public static final int SHORT_GMT = 4;
/**
- * {{@literal @}icu} A style specifier for <code>getDisplayName()</code> indicating
+ * <strong>[icu]</strong> A style specifier for <code>getDisplayName()</code> indicating
* a long name derived from the timezone's offset, such as "GMT-08:00."
* @see #SHORT_GMT
*/
public static final int LONG_GMT = 5;
/**
- * {{@literal @}icu} A style specifier for <code>getDisplayName()</code> indicating
+ * <strong>[icu]</strong> A style specifier for <code>getDisplayName()</code> indicating
* a short name derived from the timezone's short standard or daylight
* timezone name ignoring commonlyUsed, such as "PDT."
*/
@@ -208,14 +207,14 @@
public static final int SHORT_COMMONLY_USED = 6;
/**
- * {{@literal @}icu} A style specifier for <code>getDisplayName()</code> indicating
+ * <strong>[icu]</strong> A style specifier for <code>getDisplayName()</code> indicating
* a long name derived from the timezone's fallback name, such as
* "United States (Los Angeles)."
*/
public static final int GENERIC_LOCATION = 7;
/**
- * {{@literal @}icu} The time zone ID reserved for unknown time zone.
+ * <strong>[icu]</strong> The time zone ID reserved for unknown time zone.
* @see #getTimeZone(String)
*/
public static final String UNKNOWN_ZONE_ID = "Etc/Unknown";
@@ -226,7 +225,7 @@
static final String GMT_ZONE_ID = "Etc/GMT";
/**
- * {{@literal @}icu} The immutable (frozen) "unknown" time zone.
+ * <strong>[icu]</strong> The immutable (frozen) "unknown" time zone.
* It behaves like the GMT/UTC time zone but has the UNKNOWN_ZONE_ID = "Etc/Unknown".
* {@link TimeZone#getTimeZone(String)} returns a mutable clone of this
* time zone if the input ID is not recognized.
@@ -237,32 +236,29 @@
public static final TimeZone UNKNOWN_ZONE = new ConstantZone(0, UNKNOWN_ZONE_ID).freeze();
/**
- * {{@literal @}icu} The immutable GMT (=UTC) time zone. Its ID is "Etc/GMT".
+ * <strong>[icu]</strong> The immutable GMT (=UTC) time zone. Its ID is "Etc/GMT".
*/
public static final TimeZone GMT_ZONE = new ConstantZone(0, GMT_ZONE_ID).freeze();
/**
- * {{@literal @}icu} System time zone type constants used by filtering zones in
+ * <strong>[icu]</strong> System time zone type constants used by filtering zones in
* {@link TimeZone#getAvailableIDs(SystemTimeZoneType, String, Integer)}
*/
public enum SystemTimeZoneType {
/**
* Any system zones.
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
ANY,
/**
* Canonical system zones.
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
CANONICAL,
/**
* Canonical system zones associated with actual locations.
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
CANONICAL_LOCATION,
@@ -756,7 +752,7 @@
}
/**
- * {{@literal @}icu} Returns the default time zone type currently used.
+ * <strong>[icu]</strong> Returns the default time zone type currently used.
* @return The default time zone type, either <code>TIMEZONE_ICU</code> or
* <code>TIMEZONE_JDK</code>.
*/
@@ -765,7 +761,7 @@
}
/**
- * {{@literal @}icu} Returns a set of time zone ID strings with the given filter conditions.
+ * <strong>[icu]</strong> Returns a set of time zone ID strings with the given filter conditions.
* <p><b>Note:</b>A <code>Set</code> returned by this method is
* immutable.
* @param zoneType The system time zone type.
@@ -826,7 +822,7 @@
}
/**
- * {{@literal @}icu} Returns the number of IDs in the equivalency group that
+ * <strong>[icu]</strong> Returns the number of IDs in the equivalency group that
* includes the given ID. An equivalency group contains zones
* that have the same GMT offset and rules.
*
@@ -977,7 +973,7 @@
}
/**
- * {{@literal @}icu} Returns the time zone data version currently used by ICU.
+ * <strong>[icu]</strong> Returns the time zone data version currently used by ICU.
*
* @return the version string, such as "2007f"
* @throws MissingResourceException if ICU time zone resource bundle
@@ -989,7 +985,7 @@
}
/**
- * {{@literal @}icu} Returns the canonical system time zone ID or the normalized
+ * <strong>[icu]</strong> Returns the canonical system time zone ID or the normalized
* custom time zone ID for the given time zone ID.
* @param id The input time zone ID to be canonicalized.
* @return The canonical system time zone ID or the custom time zone ID
@@ -1002,7 +998,7 @@
}
/**
- * {{@literal @}icu} Returns the canonical system time zone ID or the normalized
+ * <strong>[icu]</strong> Returns the canonical system time zone ID or the normalized
* custom time zone ID for the given time zone ID.
* @param id The input time zone ID to be canonicalized.
* @param isSystemID When non-null boolean array is specified and
@@ -1036,7 +1032,7 @@
}
/**
- * {{@literal @}icu} Returns the region code associated with the given
+ * <strong>[icu]</strong> Returns the region code associated with the given
* system time zone ID. The region code is either ISO 3166
* 2-letter country code or UN M.49 3-digit area code.
* When the time zone is not associated with a specific location,
@@ -1063,7 +1059,7 @@
}
/**
- * {{@literal @}icu} Converts a system time zone ID to an equivalent Windows time zone ID. For example,
+ * <strong>[icu]</strong> Converts a system time zone ID to an equivalent Windows time zone ID. For example,
* Windows time zone ID "Pacific Standard Time" is returned for input "America/Los_Angeles".
*
* <p>There are system time zones that cannot be mapped to Windows zones. When the input
@@ -1118,7 +1114,7 @@
}
/**
- * {{@literal @}icu} Converts a Windows time zone ID to an equivalent system time zone ID
+ * <strong>[icu]</strong> Converts a Windows time zone ID to an equivalent system time zone ID
* for a region. For example, system time zone ID "America/Los_Angeles" is returned
* for input Windows ID "Pacific Standard Time" and region "US" (or <code>null</code>),
* "America/Vancouver" is returned for the same Windows ID "Pacific Standard Time" and
diff --git a/android_icu4j/src/main/java/android/icu/util/ULocale.java b/android_icu4j/src/main/java/android/icu/util/ULocale.java
index 0912697..d8d8f9c 100644
--- a/android_icu4j/src/main/java/android/icu/util/ULocale.java
+++ b/android_icu4j/src/main/java/android/icu/util/ULocale.java
@@ -47,7 +47,7 @@
import android.icu.text.LocaleDisplayNames.DialectHandling;
/**
- * {{@literal @}icuenhanced java.util.Locale}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.Locale}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* A class analogous to {@link java.util.Locale} that provides additional
* support for ICU protocol. In ICU 3.0 this class is enhanced to support
@@ -407,7 +407,7 @@
}
/**
- * {{@literal @}icu} Returns a ULocale object for a {@link java.util.Locale}.
+ * <strong>[icu]</strong> Returns a ULocale object for a {@link java.util.Locale}.
* The ULocale is canonicalized.
* @param loc a JDK locale
*/
@@ -424,7 +424,7 @@
}
/**
- * {{@literal @}icu} Constructs a ULocale from a RFC 3066 locale ID. The locale ID consists
+ * <strong>[icu]</strong> Constructs a ULocale from a RFC 3066 locale ID. The locale ID consists
* of optional language, script, country, and variant fields in that order,
* separated by underscores, followed by an optional keyword list. The
* script, if present, is four characters long-- this distinguishes it
@@ -479,7 +479,7 @@
}
/**
- * {{@literal @}icu} Creates a ULocale from the id by first canonicalizing the id.
+ * <strong>[icu]</strong> Creates a ULocale from the id by first canonicalizing the id.
* @param nonCanonicalID the locale id to canonicalize
* @return the locale created from the canonical version of the ID.
*/
@@ -512,7 +512,7 @@
}
/**
- * {{@literal @}icu} Converts this ULocale object to a {@link java.util.Locale}.
+ * <strong>[icu]</strong> Converts this ULocale object to a {@link java.util.Locale}.
* @return a JDK locale that either exactly represents this object
* or is the closest approximation.
*/
@@ -841,7 +841,7 @@
}
/**
- * {{@literal @}icunote} Unlike the Locale API, this returns an array of <code>ULocale</code>,
+ * <strong>[icu] Note:</strong> Unlike the Locale API, this returns an array of <code>ULocale</code>,
* not <code>Locale</code>. Returns a list of all installed locales.
*/
public static ULocale[] getAvailableLocales() {
@@ -898,7 +898,7 @@
}
/**
- * {{@literal @}icu} Returns the script code for the specified locale, which might be the empty
+ * <strong>[icu]</strong> Returns the script code for the specified locale, which might be the empty
* string.
* @see #getDisplayScript()
* @see #getDisplayScript(ULocale)
@@ -918,7 +918,7 @@
}
/**
- * {{@literal @}icu} Returns the country/region code for this locale, which will either be the empty string
+ * <strong>[icu]</strong> Returns the country/region code for this locale, which will either be the empty string
* or an uppercase ISO 3166 2-letter code.
* @param localeID The locale identification string.
* @see #getDisplayCountry()
@@ -938,7 +938,7 @@
}
/**
- * {{@literal @}icu} Returns the variant code for the specified locale, which might be the empty string.
+ * <strong>[icu]</strong> Returns the variant code for the specified locale, which might be the empty string.
* @see #getDisplayVariant()
* @see #getDisplayVariant(ULocale)
*/
@@ -947,7 +947,7 @@
}
/**
- * {{@literal @}icu} Returns the fallback locale for the specified locale, which might be the
+ * <strong>[icu]</strong> Returns the fallback locale for the specified locale, which might be the
* empty string.
*/
public static String getFallback(String localeID) {
@@ -955,7 +955,7 @@
}
/**
- * {{@literal @}icu} Returns the fallback locale for this locale. If this locale is root,
+ * <strong>[icu]</strong> Returns the fallback locale for this locale. If this locale is root,
* returns null.
*/
public ULocale getFallback() {
@@ -989,7 +989,7 @@
}
/**
- * {{@literal @}icu} Returns the (normalized) base name for this locale,
+ * <strong>[icu]</strong> Returns the (normalized) base name for this locale,
* like {@link #getName()}, but without keywords.
*
* @return the base name as a String.
@@ -999,7 +999,7 @@
}
/**
- * {{@literal @}icu} Returns the (normalized) base name for the specified locale,
+ * <strong>[icu]</strong> Returns the (normalized) base name for the specified locale,
* like {@link #getName(String)}, but without keywords.
*
* @param localeID the locale ID as a string
@@ -1013,7 +1013,7 @@
}
/**
- * {{@literal @}icu} Returns the (normalized) full name for this locale.
+ * <strong>[icu]</strong> Returns the (normalized) full name for this locale.
*
* @return String the full name of the localeID
*/
@@ -1052,7 +1052,7 @@
}
/**
- * {{@literal @}icu} Returns the (normalized) full name for the specified locale.
+ * <strong>[icu]</strong> Returns the (normalized) full name for the specified locale.
*
* @param localeID the localeID as a string
* @return String the full name of the localeID
@@ -1084,7 +1084,7 @@
}
/**
- * {{@literal @}icu} Returns an iterator over keywords for this locale. If there
+ * <strong>[icu]</strong> Returns an iterator over keywords for this locale. If there
* are no keywords, returns null.
* @return iterator over keywords, or null if there are no keywords.
*/
@@ -1093,7 +1093,7 @@
}
/**
- * {{@literal @}icu} Returns an iterator over keywords for the specified locale. If there
+ * <strong>[icu]</strong> Returns an iterator over keywords for the specified locale. If there
* are no keywords, returns null.
* @return an iterator over the keywords in the specified locale, or null
* if there are no keywords.
@@ -1103,7 +1103,7 @@
}
/**
- * {{@literal @}icu} Returns the value for a keyword in this locale. If the keyword is not
+ * <strong>[icu]</strong> Returns the value for a keyword in this locale. If the keyword is not
* defined, returns null.
* @param keywordName name of the keyword whose value is desired. Case insensitive.
* @return the value of the keyword, or null.
@@ -1113,7 +1113,7 @@
}
/**
- * {{@literal @}icu} Returns the value for a keyword in the specified locale. If the keyword is
+ * <strong>[icu]</strong> Returns the value for a keyword in the specified locale. If the keyword is
* not defined, returns null. The locale name does not need to be normalized.
* @param keywordName name of the keyword whose value is desired. Case insensitive.
* @return String the value of the keyword as a string
@@ -1123,7 +1123,7 @@
}
/**
- * {{@literal @}icu} Returns the canonical name for the specified locale ID. This is used to
+ * <strong>[icu]</strong> Returns the canonical name for the specified locale ID. This is used to
* convert POSIX and other grandfathered IDs to standard ICU form.
* @param localeID the locale id
* @return the canonicalized id
@@ -1188,7 +1188,7 @@
}
/**
- * {{@literal @}icu} Given a keyword and a value, return a new locale with an updated
+ * <strong>[icu]</strong> Given a keyword and a value, return a new locale with an updated
* keyword and value. If the keyword is null, this removes all keywords from the locale id.
* Otherwise, if the value is null, this removes the value for this keyword from the
* locale id. Otherwise, this adds/replaces the value for this keyword in the locale id.
@@ -1253,7 +1253,7 @@
}
/**
- * {{@literal @}icu} Returns a three-letter abbreviation for this locale's language. If the locale
+ * <strong>[icu]</strong> Returns a three-letter abbreviation for this locale's language. If the locale
* doesn't specify a language, returns the empty string. Otherwise, returns
* a lowercase ISO 639-2/T language code.
* The ISO 639-2 language codes can be found on-line at
@@ -1277,7 +1277,7 @@
}
/**
- * {{@literal @}icu} Returns a three-letter abbreviation for this locale's country/region. If the locale
+ * <strong>[icu]</strong> Returns a three-letter abbreviation for this locale's country/region. If the locale
* doesn't specify a country, returns the empty string. Otherwise, returns
* an uppercase ISO 3166 3-letter country code.
* @exception MissingResourceException Throws MissingResourceException if the
@@ -1295,7 +1295,7 @@
"root-en-es-pt-zh-ja-ko-de-fr-it-ar+he+fa+ru-nl-pl-th-tr-";
/**
- * {{@literal @}icu} Returns whether this locale's script is written right-to-left.
+ * <strong>[icu]</strong> Returns whether this locale's script is written right-to-left.
* If there is no script subtag, then the likely script is used,
* see {@link #addLikelySubtags(ULocale)}.
* If no likely script is known, then false is returned.
@@ -1356,7 +1356,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's language localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's language localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose language will be displayed
* @param displayLocaleID the id of the locale in which to display the name.
@@ -1368,7 +1368,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's language localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's language localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose language will be displayed.
* @param displayLocale the locale in which to display the name.
@@ -1378,7 +1378,7 @@
return getDisplayLanguageInternal(new ULocale(localeID), displayLocale, false);
}
/**
- * {{@literal @}icu} Returns this locale's language localized for display in the default <code>DISPLAY</code> locale.
+ * <strong>[icu]</strong> Returns this locale's language localized for display in the default <code>DISPLAY</code> locale.
* If a dialect name is present in the data, then it is returned.
* @return the localized language name.
* @see Category#DISPLAY
@@ -1388,7 +1388,7 @@
}
/**
- * {{@literal @}icu} Returns this locale's language localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns this locale's language localized for display in the provided locale.
* If a dialect name is present in the data, then it is returned.
* @param displayLocale the locale in which to display the name.
* @return the localized language name.
@@ -1398,7 +1398,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's language localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's language localized for display in the provided locale.
* If a dialect name is present in the data, then it is returned.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose language will be displayed
@@ -1411,7 +1411,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's language localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's language localized for display in the provided locale.
* If a dialect name is present in the data, then it is returned.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose language will be displayed.
@@ -1438,10 +1438,9 @@
}
/**
- * {{@literal @}icu} Returns this locale's script localized for display in the default <code>DISPLAY</code> locale.
+ * <strong>[icu]</strong> Returns this locale's script localized for display in the default <code>DISPLAY</code> locale.
* @return the localized script name.
* @see Category#DISPLAY
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1461,10 +1460,9 @@
}
/**
- * {{@literal @}icu} Returns this locale's script localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns this locale's script localized for display in the provided locale.
* @param displayLocale the locale in which to display the name.
* @return the localized script name.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1475,7 +1473,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's script localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's script localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose script will be displayed
* @param displayLocaleID the id of the locale in which to display the name.
@@ -1485,12 +1483,11 @@
return getDisplayScriptInternal(new ULocale(localeID), new ULocale(displayLocaleID));
}
/**
- * {{@literal @}icu} Returns a locale's script localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's script localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose script will be displayed
* @param displayLocaleID the id of the locale in which to display the name.
* @return the localized script name.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1501,7 +1498,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's script localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's script localized for display in the provided locale.
* @param localeID the id of the locale whose script will be displayed.
* @param displayLocale the locale in which to display the name.
* @return the localized script name.
@@ -1510,11 +1507,10 @@
return getDisplayScriptInternal(new ULocale(localeID), displayLocale);
}
/**
- * {{@literal @}icu} Returns a locale's script localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's script localized for display in the provided locale.
* @param localeID the id of the locale whose script will be displayed.
* @param displayLocale the locale in which to display the name.
* @return the localized script name.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -1558,7 +1554,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's country localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's country localized for display in the provided locale.
* <b>Warning: </b>this is for the region part of a valid locale ID; it cannot just be the region code (like "FR").
* To get the display name for a region alone, or for other options, use {@link LocaleDisplayNames} instead.
* This is a cover for the ICU4C API.
@@ -1571,7 +1567,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's country localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's country localized for display in the provided locale.
* <b>Warning: </b>this is for the region part of a valid locale ID; it cannot just be the region code (like "FR").
* To get the display name for a region alone, or for other options, use {@link LocaleDisplayNames} instead.
* This is a cover for the ICU4C API.
@@ -1608,7 +1604,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's variant localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's variant localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose variant will be displayed
* @param displayLocaleID the id of the locale in which to display the name.
@@ -1619,7 +1615,7 @@
}
/**
- * {{@literal @}icu} Returns a locale's variant localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns a locale's variant localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose variant will be displayed.
* @param displayLocale the locale in which to display the name.
@@ -1635,7 +1631,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword localized for display in the default <code>DISPLAY</code> locale.
+ * <strong>[icu]</strong> Returns a keyword localized for display in the default <code>DISPLAY</code> locale.
* @param keyword the keyword to be displayed.
* @return the localized keyword name.
* @see #getKeywords()
@@ -1646,7 +1642,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword localized for display in the specified locale.
+ * <strong>[icu]</strong> Returns a keyword localized for display in the specified locale.
* @param keyword the keyword to be displayed.
* @param displayLocaleID the id of the locale in which to display the keyword.
* @return the localized keyword name.
@@ -1657,7 +1653,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword localized for display in the specified locale.
+ * <strong>[icu]</strong> Returns a keyword localized for display in the specified locale.
* @param keyword the keyword to be displayed.
* @param displayLocale the locale in which to display the keyword.
* @return the localized keyword name.
@@ -1672,7 +1668,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword value localized for display in the default <code>DISPLAY</code> locale.
+ * <strong>[icu]</strong> Returns a keyword value localized for display in the default <code>DISPLAY</code> locale.
* @param keyword the keyword whose value is to be displayed.
* @return the localized value name.
* @see Category#DISPLAY
@@ -1682,7 +1678,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword value localized for display in the specified locale.
+ * <strong>[icu]</strong> Returns a keyword value localized for display in the specified locale.
* @param keyword the keyword whose value is to be displayed.
* @param displayLocale the locale in which to display the value.
* @return the localized value name.
@@ -1692,7 +1688,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword value localized for display in the specified locale.
+ * <strong>[icu]</strong> Returns a keyword value localized for display in the specified locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose keyword value is to be displayed.
* @param keyword the keyword whose value is to be displayed.
@@ -1706,7 +1702,7 @@
}
/**
- * {{@literal @}icu} Returns a keyword value localized for display in the specified locale.
+ * <strong>[icu]</strong> Returns a keyword value localized for display in the specified locale.
* This is a cover for the ICU4C API.
* @param localeID the id of the locale whose keyword value is to be displayed.
* @param keyword the keyword whose value is to be displayed.
@@ -1745,7 +1741,7 @@
}
/**
- * {{@literal @}icu} Returns the locale ID localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns the locale ID localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the locale whose name is to be displayed.
* @param displayLocaleID the id of the locale in which to display the locale name.
@@ -1756,7 +1752,7 @@
}
/**
- * {{@literal @}icu} Returns the locale ID localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns the locale ID localized for display in the provided locale.
* This is a cover for the ICU4C API.
* @param localeID the locale whose name is to be displayed.
* @param displayLocale the locale in which to display the locale name.
@@ -1771,7 +1767,7 @@
}
/**
- * {{@literal @}icu} Returns this locale name localized for display in the default <code>DISPLAY</code> locale.
+ * <strong>[icu]</strong> Returns this locale name localized for display in the default <code>DISPLAY</code> locale.
* If a dialect name is present in the locale data, then it is returned.
* @return the localized locale name.
* @see Category#DISPLAY
@@ -1781,7 +1777,7 @@
}
/**
- * {{@literal @}icu} Returns this locale name localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns this locale name localized for display in the provided locale.
* If a dialect name is present in the locale data, then it is returned.
* @param displayLocale the locale in which to display the locale name.
* @return the localized locale name.
@@ -1791,7 +1787,7 @@
}
/**
- * {{@literal @}icu} Returns the locale ID localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns the locale ID localized for display in the provided locale.
* If a dialect name is present in the locale data, then it is returned.
* This is a cover for the ICU4C API.
* @param localeID the locale whose name is to be displayed.
@@ -1804,7 +1800,7 @@
}
/**
- * {{@literal @}icu} Returns the locale ID localized for display in the provided locale.
+ * <strong>[icu]</strong> Returns the locale ID localized for display in the provided locale.
* If a dialect name is present in the locale data, then it is returned.
* This is a cover for the ICU4C API.
* @param localeID the locale whose name is to be displayed.
@@ -1821,7 +1817,7 @@
}
/**
- * {{@literal @}icu} Returns this locale's layout orientation for characters. The possible
+ * <strong>[icu]</strong> Returns this locale's layout orientation for characters. The possible
* values are "left-to-right", "right-to-left", "top-to-bottom" or
* "bottom-to-top".
* @return The locale's layout orientation for characters.
@@ -1832,7 +1828,7 @@
}
/**
- * {{@literal @}icu} Returns this locale's layout orientation for lines. The possible
+ * <strong>[icu]</strong> Returns this locale's layout orientation for lines. The possible
* values are "left-to-right", "right-to-left", "top-to-bottom" or
* "bottom-to-top".
* @return The locale's layout orientation for lines.
@@ -1843,21 +1839,19 @@
}
/**
- * {{@literal @}icu} Selector for <tt>getLocale()</tt> indicating the locale of the
+ * <strong>[icu]</strong> Selector for <tt>getLocale()</tt> indicating the locale of the
* resource containing the data. This is always at or above the
* valid locale. If the valid locale does not contain the
* specific data being requested, then the actual locale will be
* above the valid locale. If the object was not constructed from
* locale data, then the valid locale is <i>null</i>.
*
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static Type ACTUAL_LOCALE = new Type();
/**
- * {{@literal @}icu} Selector for <tt>getLocale()</tt> indicating the most specific
+ * <strong>[icu]</strong> Selector for <tt>getLocale()</tt> indicating the most specific
* locale for which any data exists. This is always at or above
* the requested locale, and at or below the actual locale. If
* the requested locale does not correspond to any resource data,
@@ -1867,8 +1861,6 @@
*
* <p>Note: The valid locale will be returned correctly in ICU
* 3.0 or later. In ICU 2.8, it is not returned correctly.
- * {@literal @}draft ICU 2.8 (retain)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static Type VALID_LOCALE = new Type();
@@ -1878,8 +1870,6 @@
* @see android.icu.util.ULocale
* @see android.icu.util.ULocale#ACTUAL_LOCALE
* @see android.icu.util.ULocale#VALID_LOCALE
- * {@literal @}draft ICU 2.8 (retainAll)
- * {@literal @}provisional This API might change or be removed in a future release.
* @hide draft / provisional / internal are hidden on Android
*/
public static final class Type {
@@ -1887,7 +1877,7 @@
}
/**
- * {{@literal @}icu} Based on a HTTP formatted list of acceptable locales, determine an available
+ * <strong>[icu]</strong> Based on a HTTP formatted list of acceptable locales, determine an available
* locale for the user. NullPointerException is thrown if acceptLanguageList or
* availableLocales is null. If fallback is non-null, it will contain true if a
* fallback locale (one not in the acceptLanguageList) was returned. The value on
@@ -1919,7 +1909,7 @@
}
/**
- * {{@literal @}icu} Based on a list of acceptable locales, determine an available locale for the
+ * <strong>[icu]</strong> Based on a list of acceptable locales, determine an available locale for the
* user. NullPointerException is thrown if acceptLanguageList or availableLocales is
* null. If fallback is non-null, it will contain true if a fallback locale (one not
* in the acceptLanguageList) was returned. The value on entry is ignored. ULocale
@@ -1981,7 +1971,7 @@
}
/**
- * {{@literal @}icu} Based on a HTTP formatted list of acceptable locales, determine an available
+ * <strong>[icu]</strong> Based on a HTTP formatted list of acceptable locales, determine an available
* locale for the user. NullPointerException is thrown if acceptLanguageList or
* availableLocales is null. If fallback is non-null, it will contain true if a
* fallback locale (one not in the acceptLanguageList) was returned. The value on
@@ -2002,7 +1992,7 @@
}
/**
- * {{@literal @}icu} Based on an ordered array of acceptable locales, determine an available
+ * <strong>[icu]</strong> Based on an ordered array of acceptable locales, determine an available
* locale for the user. NullPointerException is thrown if acceptLanguageList or
* availableLocales is null. If fallback is non-null, it will contain true if a
* fallback locale (one not in the acceptLanguageList) was returned. The value on
@@ -2283,7 +2273,7 @@
private static final String UNDEFINED_REGION = "ZZ";
/**
- * {{@literal @}icu} Adds the likely subtags for a provided locale ID, per the algorithm
+ * <strong>[icu]</strong> Adds the likely subtags for a provided locale ID, per the algorithm
* described in the following CLDR technical report:
*
* http://www.unicode.org/reports/tr35/#Likely_Subtags
@@ -2331,7 +2321,7 @@
}
/**
- * {{@literal @}icu} Minimizes the subtags for a provided locale ID, per the algorithm described
+ * <strong>[icu]</strong> Minimizes the subtags for a provided locale ID, per the algorithm described
* in the following CLDR technical report:<blockquote>
*
* <a href="http://www.unicode.org/reports/tr35/#Likely_Subtags"
@@ -2362,7 +2352,6 @@
/**
* Options for minimizeSubtags.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -2371,7 +2360,6 @@
public enum Minimize {
/**
* Favor including the script, when either the region <b>or</b> the script could be suppressed, but not both.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -2379,7 +2367,6 @@
FAVOR_SCRIPT,
/**
* Favor including the region, when either the region <b>or</b> the script could be suppressed, but not both.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -2388,7 +2375,7 @@
}
/**
- * {{@literal @}icu} Minimizes the subtags for a provided locale ID, per the algorithm described
+ * <strong>[icu]</strong> Minimizes the subtags for a provided locale ID, per the algorithm described
* in the following CLDR technical report:<blockquote>
*
* <a href="http://www.unicode.org/reports/tr35/#Likely_Subtags"
@@ -2414,7 +2401,6 @@
* @param loc The ULocale to minimize
* @param fieldToFavor Indicate which should be preferred, when either the region <b>or</b> the script could be suppressed, but not both.
* @return The minimized ULocale instance.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -3279,7 +3265,7 @@
}
/**
- * {{@literal @}icu} Converts the specified keyword (legacy key, or BCP 47 Unicode locale
+ * <strong>[icu]</strong> Converts the specified keyword (legacy key, or BCP 47 Unicode locale
* extension key) to the equivalent BCP 47 Unicode locale extension key.
* For example, BCP 47 Unicode locale extension key "co" is returned for
* the input keyword "collation".
@@ -3307,7 +3293,7 @@
}
/**
- * {{@literal @}icu} Converts the specified keyword value (legacy type, or BCP 47
+ * <strong>[icu]</strong> Converts the specified keyword value (legacy type, or BCP 47
* Unicode locale extension type) to the well-formed BCP 47 Unicode locale
* extension type for the specified keyword (category). For example, BCP 47
* Unicode locale extension type "phonebk" is returned for the input
@@ -3342,7 +3328,7 @@
}
/**
- * {{@literal @}icu} Converts the specified keyword (BCP 47 Unicode locale extension key, or
+ * <strong>[icu]</strong> Converts the specified keyword (BCP 47 Unicode locale extension key, or
* legacy key) to the legacy key. For example, legacy key "collation" is
* returned for the input BCP 47 Unicode locale extension key "co".
*
@@ -3371,7 +3357,7 @@
}
/**
- * {{@literal @}icu} Converts the specified keyword value (BCP 47 Unicode locale extension type,
+ * <strong>[icu]</strong> Converts the specified keyword value (BCP 47 Unicode locale extension type,
* or legacy type or type alias) to the canonical legacy type. For example,
* the legacy type "phonebook" is returned for the input BCP 47 Unicode
* locale extension type "phonebk" with the keyword "collation" (or "co").
diff --git a/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java b/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java
index a7af0fe..6b8d63a 100644
--- a/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java
+++ b/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java
@@ -27,7 +27,7 @@
import android.icu.impl.SimpleCache;
/**
- * {{@literal @}icuenhanced java.util.ResourceBundle}.{{@literal @}icu _usage_}
+ * <strong>[icu enhancement]</strong> ICU's replacement for {@link java.util.ResourceBundle}. Methods, fields, and other functionality specific to ICU are labeled '<strong>[icu]</strong>'.
*
* <p>A class representing a collection of resource information pertaining to a given
* locale. A resource bundle provides a way of accessing locale- specific information in a
@@ -97,7 +97,7 @@
/**
- * {{@literal @}icu} Creates a resource bundle using the specified base name and locale.
+ * <strong>[icu]</strong> Creates a resource bundle using the specified base name and locale.
* ICU_DATA_CLASS is used as the default root.
* @param baseName the base name of the resource bundle, a fully qualified class name
* @param localeName the locale for which a resource bundle is desired
@@ -111,7 +111,7 @@
}
/**
- * {{@literal @}icu} Creates a resource bundle using the specified base name, locale, and class root.
+ * <strong>[icu]</strong> Creates a resource bundle using the specified base name, locale, and class root.
*
* @param baseName the base name of the resource bundle, a fully qualified class name
* @param localeName the locale for which a resource bundle is desired
@@ -126,7 +126,7 @@
}
/**
- * {{@literal @}icu} Creates a resource bundle using the specified base name, locale, and class
+ * <strong>[icu]</strong> Creates a resource bundle using the specified base name, locale, and class
* root.
*
* @param baseName the base name of the resource bundle, a fully qualified class name
@@ -145,7 +145,7 @@
}
/**
- * {{@literal @}icu} Sole constructor. (For invocation by subclass constructors, typically
+ * <strong>[icu]</strong> Sole constructor. (For invocation by subclass constructors, typically
* implicit.) This is public for compatibility with Java, whose compiler
* will generate public default constructors for an abstract class.
*/
@@ -153,7 +153,7 @@
}
/**
- * {{@literal @}icu} Creates a UResourceBundle for the locale specified, from which users can extract
+ * <strong>[icu]</strong> Creates a UResourceBundle for the locale specified, from which users can extract
* resources by using their corresponding keys.
* @param locale specifies the locale for which we want to open the resource.
* If null the bundle for default locale is opened.
@@ -168,7 +168,7 @@
}
/**
- * {{@literal @}icu} Creates a UResourceBundle for the default locale and specified base name,
+ * <strong>[icu]</strong> Creates a UResourceBundle for the default locale and specified base name,
* from which users can extract resources by using their corresponding keys.
* @param baseName specifies the locale for which we want to open the resource.
* If null the bundle for default locale is opened.
@@ -184,7 +184,7 @@
}
/**
- * {{@literal @}icu} Creates a UResourceBundle for the specified locale and specified base name,
+ * <strong>[icu]</strong> Creates a UResourceBundle for the specified locale and specified base name,
* from which users can extract resources by using their corresponding keys.
* @param baseName specifies the locale for which we want to open the resource.
* If null the bundle for default locale is opened.
@@ -204,7 +204,7 @@
}
/**
- * {{@literal @}icu} Creates a UResourceBundle, from which users can extract resources by using
+ * <strong>[icu]</strong> Creates a UResourceBundle, from which users can extract resources by using
* their corresponding keys.
* @param baseName string containing the name of the data package.
* If null the default ICU package name is used.
@@ -224,7 +224,7 @@
}
/**
- * {{@literal @}icu} Creates a UResourceBundle for the specified locale and specified base name,
+ * <strong>[icu]</strong> Creates a UResourceBundle for the specified locale and specified base name,
* from which users can extract resources by using their corresponding keys.
* @param baseName specifies the locale for which we want to open the resource.
* If null the bundle for default locale is opened.
@@ -243,7 +243,7 @@
}
/**
- * {{@literal @}icu} Creates a UResourceBundle, from which users can extract resources by using
+ * <strong>[icu]</strong> Creates a UResourceBundle, from which users can extract resources by using
* their corresponding keys.<br><br>
* Note: Please use this API for loading non-ICU resources. Java security does not
* allow loading of resources across jar files. You must provide your class loader
@@ -267,7 +267,7 @@
}
/**
- * {{@literal @}icu} Returns the RFC 3066 conformant locale id of this resource bundle.
+ * <strong>[icu]</strong> Returns the RFC 3066 conformant locale id of this resource bundle.
* This method can be used after a call to getBundleInstance() to
* determine whether the resource bundle returned really
* corresponds to the requested locale or is a fallback.
@@ -277,19 +277,19 @@
public abstract ULocale getULocale();
/**
- * {{@literal @}icu} Returns the localeID
+ * <strong>[icu]</strong> Returns the localeID
* @return The string representation of the localeID
*/
protected abstract String getLocaleID();
/**
- * {{@literal @}icu} Returns the base name of the resource bundle
+ * <strong>[icu]</strong> Returns the base name of the resource bundle
* @return The string representation of the base name
*/
protected abstract String getBaseName();
/**
- * {{@literal @}icu} Returns the parent bundle
+ * <strong>[icu]</strong> Returns the parent bundle
* @return The parent bundle
*/
protected abstract UResourceBundle getParent();
@@ -308,7 +308,6 @@
new SimpleCache<ResourceCacheKey, UResourceBundle>();
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -332,7 +331,6 @@
* Method used by subclasses to add a resource bundle object to the managed
* cache. Works like a putIfAbsent(): If the cache already contains a matching
* bundle, that one will be retained and returned.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -351,7 +349,6 @@
/**
* Method used by sub classes to load a resource bundle object from the managed cache
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -507,7 +504,7 @@
}
/**
- * {{@literal @}icu} Loads a new resource bundle for the given base name, locale and class loader.
+ * <strong>[icu]</strong> Loads a new resource bundle for the given base name, locale and class loader.
* Optionally will disable loading of fallback bundles.
* @param baseName the base name of the resource bundle, a fully qualified class name
* @param localeName the locale for which a resource bundle is desired
@@ -560,7 +557,7 @@
}
/**
- * {{@literal @}icu} Returns a binary data item from a binary resource, as a read-only ByteBuffer.
+ * <strong>[icu]</strong> Returns a binary data item from a binary resource, as a read-only ByteBuffer.
*
* @return a pointer to a chunk of unsigned bytes which live in a memory mapped/DLL
* file.
@@ -601,7 +598,7 @@
}
/**
- * {{@literal @}icu} Returns a binary data from a binary resource, as a byte array with a copy
+ * <strong>[icu]</strong> Returns a binary data from a binary resource, as a byte array with a copy
* of the bytes from the resource bundle.
*
* @param ba The byte array to write the bytes to. A null variable is OK.
@@ -616,7 +613,7 @@
}
/**
- * {{@literal @}icu} Returns a 32 bit integer array from a resource.
+ * <strong>[icu]</strong> Returns a 32 bit integer array from a resource.
*
* @return a pointer to a chunk of unsigned bytes which live in a memory mapped/DLL file.
* @see #getBinary()
@@ -629,7 +626,7 @@
}
/**
- * {{@literal @}icu} Returns a signed integer from a resource.
+ * <strong>[icu]</strong> Returns a signed integer from a resource.
*
* @return an integer value
* @see #getIntVector
@@ -642,7 +639,7 @@
}
/**
- * {{@literal @}icu} Returns a unsigned integer from a resource.
+ * <strong>[icu]</strong> Returns a unsigned integer from a resource.
* This integer is originally 28 bit and the sign gets propagated.
*
* @return an integer value
@@ -656,7 +653,7 @@
}
/**
- * {{@literal @}icu} Returns a resource in a given resource that has a given key.
+ * <strong>[icu]</strong> Returns a resource in a given resource that has a given key.
*
* @param aKey a key associated with the wanted resource
* @return a resource bundle object representing the resource
@@ -680,7 +677,6 @@
* @param aKey the key associated with the wanted resource
* @return the resource, or null
* @see #get(String)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -716,7 +712,7 @@
}
/**
- * {{@literal @}icu} Returns the resource in a given resource at the specified index.
+ * <strong>[icu]</strong> Returns the resource in a given resource at the specified index.
*
* @param index an index to the wanted resource.
* @return the sub resource UResourceBundle object
@@ -747,7 +743,6 @@
* @param index the index of the resource
* @return the resource, or null
* @see #get(int)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -782,7 +777,6 @@
* Returns a Set of all keys contained in this ResourceBundle and its parent bundles.
* @return a Set of all keys contained in this ResourceBundle and its parent bundles,
* which is empty if this is not a bundle or a table resource
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -834,7 +828,6 @@
* This does not include further keys from parent bundles.
* @return a Set of the keys contained only in this ResourceBundle,
* which is empty if this is not a bundle or a table resource
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -844,7 +837,7 @@
}
/**
- * {{@literal @}icu} Returns the size of a resource. Size for scalar types is always 1, and for
+ * <strong>[icu]</strong> Returns the size of a resource. Size for scalar types is always 1, and for
* vector/table types is the number of child resources.
*
* <br><b>Note:</b> Integer array is treated as a scalar type. There are no APIs to
@@ -856,7 +849,7 @@
}
/**
- * {{@literal @}icu} Returns the type of a resource.
+ * <strong>[icu]</strong> Returns the type of a resource.
* Available types are {@link #INT INT}, {@link #ARRAY ARRAY},
* {@link #BINARY BINARY}, {@link #INT_VECTOR INT_VECTOR},
* {@link #STRING STRING}, {@link #TABLE TABLE}.
@@ -868,7 +861,7 @@
}
/**
- * {{@literal @}icu} Return the version number associated with this UResourceBundle as an
+ * <strong>[icu]</strong> Return the version number associated with this UResourceBundle as an
* VersionInfo object.
* @return VersionInfo object containing the version of the bundle
*/
@@ -877,7 +870,7 @@
}
/**
- * {{@literal @}icu} Returns the iterator which iterates over this
+ * <strong>[icu]</strong> Returns the iterator which iterates over this
* resource bundle
* @return UResourceBundleIterator that iterates over the resources in the bundle
*/
@@ -886,7 +879,7 @@
}
/**
- * {{@literal @}icu} Returns the key associated with a given resource. Not all the resources have
+ * <strong>[icu]</strong> Returns the key associated with a given resource. Not all the resources have
* a key - only those that are members of a table.
* @return a key associated to this resource, or null if it doesn't have a key
*/
@@ -895,34 +888,34 @@
}
/**
- * {{@literal @}icu} Resource type constant for "no resource".
+ * <strong>[icu]</strong> Resource type constant for "no resource".
*/
public static final int NONE = -1;
/**
- * {{@literal @}icu} Resource type constant for strings.
+ * <strong>[icu]</strong> Resource type constant for strings.
*/
public static final int STRING = 0;
/**
- * {{@literal @}icu} Resource type constant for binary data.
+ * <strong>[icu]</strong> Resource type constant for binary data.
*/
public static final int BINARY = 1;
/**
- * {{@literal @}icu} Resource type constant for tables of key-value pairs.
+ * <strong>[icu]</strong> Resource type constant for tables of key-value pairs.
*/
public static final int TABLE = 2;
/**
- * {{@literal @}icu} Resource type constant for a single 28-bit integer, interpreted as
+ * <strong>[icu]</strong> Resource type constant for a single 28-bit integer, interpreted as
* signed or unsigned by the getInt() function.
* @see #getInt
*/
public static final int INT = 7;
/**
- * {{@literal @}icu} Resource type constant for arrays of resources.
+ * <strong>[icu]</strong> Resource type constant for arrays of resources.
*/
public static final int ARRAY = 8;
@@ -935,7 +928,7 @@
//====== protected members ==============
/**
- * {{@literal @}icu} Actual worker method for fetching a resource based on the given key.
+ * <strong>[icu]</strong> Actual worker method for fetching a resource based on the given key.
* Sub classes must override this method if they support resources with keys.
* @param aKey the key string of the resource to be fetched
* @param aliasesVisited hashtable object to hold references of resources already seen
@@ -950,7 +943,7 @@
}
/**
- * {{@literal @}icu} Actual worker method for fetching a resource based on the given index.
+ * <strong>[icu]</strong> Actual worker method for fetching a resource based on the given index.
* Sub classes must override this method if they support arrays of resources.
* @param index the index of the resource to be fetched
* @param aliasesVisited hashtable object to hold references of resources already seen
@@ -965,7 +958,7 @@
}
/**
- * {{@literal @}icu} Actual worker method for fetching the array of strings in a resource.
+ * <strong>[icu]</strong> Actual worker method for fetching the array of strings in a resource.
* Sub classes must override this method if they support arrays of strings.
* @return String[] An array of strings containing strings
*/
@@ -974,7 +967,7 @@
}
/**
- * {{@literal @}icu} Actual worker method for fetching the keys of resources contained in the resource.
+ * <strong>[icu]</strong> Actual worker method for fetching the keys of resources contained in the resource.
* Sub classes must override this method if they support keys and associated resources.
*
* @return Enumeration An enumeration of all the keys in this resource.
@@ -1043,7 +1036,6 @@
/**
* This method is for setting the loading status of the resource.
* The status is analogous to the warning status in ICU4C.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -1053,7 +1045,6 @@
/**
* Is this a top-level resource, that is, a whole bundle?
* @return true if this is a top-level resource
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/UniversalTimeScale.java b/android_icu4j/src/main/java/android/icu/util/UniversalTimeScale.java
index 750a803..511f604 100644
--- a/android_icu4j/src/main/java/android/icu/util/UniversalTimeScale.java
+++ b/android_icu4j/src/main/java/android/icu/util/UniversalTimeScale.java
@@ -186,7 +186,6 @@
*
* @see #getTimeScaleValue
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -201,7 +200,6 @@
*
* @see #getTimeScaleValue
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -216,7 +214,6 @@
*
* @see #getTimeScaleValue
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -231,7 +228,6 @@
*
* @see #getTimeScaleValue
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -245,7 +241,6 @@
*
* @see #getTimeScaleValue
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
@@ -598,7 +593,6 @@
* @param timeScale the time scale to convert to
* @return the time in the given time scale
*
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
diff --git a/android_icu4j/src/main/java/android/icu/util/VTimeZone.java b/android_icu4j/src/main/java/android/icu/util/VTimeZone.java
index aed5d41..6d53648 100644
--- a/android_icu4j/src/main/java/android/icu/util/VTimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/VTimeZone.java
@@ -88,7 +88,6 @@
/**
* {@inheritDoc}
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide draft / provisional / internal are hidden on Android
*/
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 4deb149..c598df1 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 @@
/**
* Data version string for ICU's internal data.
* Used for appending to data path (e.g. icudt43b)
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -154,7 +153,6 @@
/**
* Data version in ICU4J.
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -309,7 +307,6 @@
private static volatile VersionInfo javaVersion;
/**
- * {@literal @}internal
* @deprecated This API is ICU internal only.
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
@@ -577,7 +574,6 @@
* @param minDigits Minimum number of version digits
* @param maxDigits Maximum number of version digits
* @return A tailored version string
- * {@literal @}internal
* @deprecated This API is ICU internal only. (For use in CLDR, etc.)
* @hide original deprecated method
* @hide draft / provisional / internal are hidden on Android
