diff options
| author | Adam Vartanian <flooey@google.com> | 2018-10-16 12:04:36 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2018-10-18 09:49:36 +0100 |
| commit | fbb1a83de72e2557d57f99f6749d24154c515abd (patch) | |
| tree | 24120e5fa5ea3b4213234ab4bb1b44bfd538a161 /android_icu4j | |
| parent | e2b89e4b641c7fe51d54f1616c4feb902733232e (diff) | |
| download | android_external_icu-fbb1a83de72e2557d57f99f6749d24154c515abd.tar.gz android_external_icu-fbb1a83de72e2557d57f99f6749d24154c515abd.tar.bz2 android_external_icu-fbb1a83de72e2557d57f99f6749d24154c515abd.zip | |
Make BaseJavadocTagClasses descend into nodes
Prior to this change, BaseJavadocTagClasses would stop visiting when
it encountered a class declaration, which meant that inner classes
would never get visited.
Also add a bunch of nested classes to the API whitelist to ensure they
continue to be part of the public API.
Test: external/conscrypt/srcgen/generate_android_src.sh
Test: make -j48 update-api && manually confirm current.txt unchanged
Change-Id: I9a8c14fe3794f81ca4d45e3c9cf6b75c76112633
Diffstat (limited to 'android_icu4j')
76 files changed, 353 insertions, 2 deletions
diff --git a/android_icu4j/src/main/java/android/icu/impl/CacheValue.java b/android_icu4j/src/main/java/android/icu/impl/CacheValue.java index f9abfcc57..88850c158 100644 --- a/android_icu4j/src/main/java/android/icu/impl/CacheValue.java +++ b/android_icu4j/src/main/java/android/icu/impl/CacheValue.java @@ -37,6 +37,7 @@ public abstract class CacheValue<V> { /** * "Strength" of holding a value in CacheValue instances. * The default strength is {@code SOFT}. + * @hide Only a subset of ICU is exposed in Android */ public enum Strength { /** 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 a98bb48f3..9829d7f06 100644 --- a/android_icu4j/src/main/java/android/icu/impl/CalendarAstronomer.java +++ b/android_icu4j/src/main/java/android/icu/impl/CalendarAstronomer.java @@ -1497,6 +1497,7 @@ public class CalendarAstronomer { * * @see CalendarAstronomer.Equatorial * @see CalendarAstronomer.Horizon + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static final class Ecliptic { @@ -1557,6 +1558,7 @@ public class CalendarAstronomer { * * @see CalendarAstronomer.Ecliptic * @see CalendarAstronomer.Horizon + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static final class Equatorial { @@ -1624,6 +1626,7 @@ public class CalendarAstronomer { * * @see CalendarAstronomer.Ecliptic * @see CalendarAstronomer.Equatorial + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static final class Horizon { diff --git a/android_icu4j/src/main/java/android/icu/impl/CaseMapImpl.java b/android_icu4j/src/main/java/android/icu/impl/CaseMapImpl.java index b12ba55c4..575080f2e 100644 --- a/android_icu4j/src/main/java/android/icu/impl/CaseMapImpl.java +++ b/android_icu4j/src/main/java/android/icu/impl/CaseMapImpl.java @@ -21,6 +21,7 @@ public final class CaseMapImpl { /** * Implementation of UCaseProps.ContextIterator, iterates over a String. * See ustrcase.c/utf16_caseContextIterator(). + * @hide Only a subset of ICU is exposed in Android */ public static final class StringContextIterator implements UCaseProps.ContextIterator { /** 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 3bbf269f4..28d1803d1 100644 --- a/android_icu4j/src/main/java/android/icu/impl/CurrencyData.java +++ b/android_icu4j/src/main/java/android/icu/impl/CurrencyData.java @@ -24,17 +24,26 @@ public class CurrencyData { private CurrencyData() {} + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface CurrencyDisplayInfoProvider { CurrencyDisplayInfo getInstance(ULocale locale, boolean withFallback); boolean hasData(); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static abstract class CurrencyDisplayInfo extends CurrencyDisplayNames { public abstract Map<String, String> getUnitPatterns(); public abstract CurrencyFormatInfo getFormatInfo(String isoCode); public abstract CurrencySpacingInfo getSpacingInfo(); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class CurrencyFormatInfo { public final String isoCode; public final String currencyPattern; @@ -50,13 +59,22 @@ public class CurrencyData { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class CurrencySpacingInfo { private final String[][] symbols = new String[SpacingType.COUNT.ordinal()][SpacingPattern.COUNT.ordinal()]; public boolean hasBeforeCurrency = false; public boolean hasAfterCurrency = false; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static enum SpacingType { BEFORE, AFTER, COUNT }; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static enum SpacingPattern { CURRENCY_MATCH(DecimalFormatSymbols.CURRENCY_SPC_CURRENCY_MATCH), SURROUNDING_MATCH(DecimalFormatSymbols.CURRENCY_SPC_SURROUNDING_MATCH), @@ -127,6 +145,9 @@ public class CurrencyData { provider = temp; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class DefaultInfo extends CurrencyDisplayInfo { private final boolean fallback; diff --git a/android_icu4j/src/main/java/android/icu/impl/DayPeriodRules.java b/android_icu4j/src/main/java/android/icu/impl/DayPeriodRules.java index 84c1470f0..9d67d2249 100644 --- a/android_icu4j/src/main/java/android/icu/impl/DayPeriodRules.java +++ b/android_icu4j/src/main/java/android/icu/impl/DayPeriodRules.java @@ -20,6 +20,9 @@ import android.icu.util.UResourceBundle; * @hide Only a subset of ICU is exposed in Android */ public final class DayPeriodRules { + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum DayPeriod { MIDNIGHT, NOON, 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 45aacd1d4..9c5a08a08 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java +++ b/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java @@ -401,6 +401,7 @@ public final class ICUBinary { /** * Special interface for data authentication + * @hide Only a subset of ICU is exposed in Android */ public static interface Authenticate { 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 f60e2cf7a..5fcc1a5a7 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ICULocaleService.java +++ b/android_icu4j/src/main/java/android/icu/impl/ICULocaleService.java @@ -162,6 +162,7 @@ public class ICULocaleService extends ICUService { * <p>Canonicalization adjusts the locale string so that the * section before the first understore is in lower case, and the rest * is in upper case, with no trailing underscores.</p> + * @hide Only a subset of ICU is exposed in Android */ public static class LocaleKey extends ICUService.Key { private int kind; @@ -349,6 +350,7 @@ public class ICULocaleService extends ICUService { /** * A subclass of Factory that uses LocaleKeys. If 'visible' the * factory reports its IDs. + * @hide Only a subset of ICU is exposed in Android */ public static abstract class LocaleKeyFactory implements Factory { protected final String name; @@ -478,6 +480,7 @@ public class ICULocaleService extends ICUService { /** * A LocaleKeyFactory that just returns a single object for a kind/locale. + * @hide Only a subset of ICU is exposed in Android */ public static class SimpleLocaleKeyFactory extends LocaleKeyFactory { private final Object obj; @@ -548,6 +551,7 @@ public class ICULocaleService extends ICUService { * with a constructor that takes a bundle name, which determines the supported * IDs. Subclasses then override handleCreate to create the actual service * object. The default implementation returns a resource bundle. + * @hide Only a subset of ICU is exposed in Android */ public static class ICUResourceBundleFactory extends LocaleKeyFactory { protected final String bundleName; diff --git a/android_icu4j/src/main/java/android/icu/impl/ICURWLock.java b/android_icu4j/src/main/java/android/icu/impl/ICURWLock.java index 16472aced..8bad67e71 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ICURWLock.java +++ b/android_icu4j/src/main/java/android/icu/impl/ICURWLock.java @@ -45,6 +45,7 @@ public class ICURWLock { /** * Internal class used to gather statistics on the RWLock. + * @hide Only a subset of ICU is exposed in Android */ public final static class Stats { /** 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 f2fba33a4..029c78bef 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ICUResourceBundle.java +++ b/android_icu4j/src/main/java/android/icu/impl/ICUResourceBundle.java @@ -1056,6 +1056,9 @@ public class ICUResourceBundle extends UResourceBundle { return 42; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum OpenType { // C++ uresbund.cpp: enum UResOpenType /** * Open a resource bundle for the locale; diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUService.java b/android_icu4j/src/main/java/android/icu/impl/ICUService.java index 0eaaad235..850da1afd 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ICUService.java +++ b/android_icu4j/src/main/java/android/icu/impl/ICUService.java @@ -150,6 +150,7 @@ public class ICUService extends ICUNotifier { * * <p> The default implementation of Key has no fallbacks and * has no custom descriptors.</p> + * @hide Only a subset of ICU is exposed in Android */ public static class Key { private final String id; @@ -222,6 +223,7 @@ public class ICUService extends ICUNotifier { * service. A factory generates a service object from a key, * updates id->factory mappings, and returns the display name for * a supported id. + * @hide Only a subset of ICU is exposed in Android */ public static interface Factory { @@ -267,6 +269,7 @@ public class ICUService extends ICUNotifier { * updateVisibleIDs to add a mapping from its ID to itself * if visible is true, or to remove any existing mapping * for its ID if visible is false. + * @hide Only a subset of ICU is exposed in Android */ public static class SimpleFactory implements Factory { protected Object instance; @@ -919,6 +922,7 @@ public class ICUService extends ICUNotifier { * or removed from the service. Subclasses can provide * different listener interfaces that extend EventListener, and modify * acceptsListener and notifyListener as appropriate. + * @hide Only a subset of ICU is exposed in Android */ public static interface ServiceListener extends EventListener { public void serviceChanged(ICUService service); 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 62f2f77ec..284c937ea 100644 --- a/android_icu4j/src/main/java/android/icu/impl/LocaleDisplayNamesImpl.java +++ b/android_icu4j/src/main/java/android/icu/impl/LocaleDisplayNamesImpl.java @@ -622,6 +622,9 @@ public class LocaleDisplayNamesImpl extends LocaleDisplayNames { return new UiListItem(minimized, modified, nameInDisplayLocale, nameInSelf); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class DataTable { final boolean nullIfNotFound; @@ -700,6 +703,9 @@ public class LocaleDisplayNamesImpl extends LocaleDisplayNames { static final DataTables impl = DataTables.load("android.icu.impl.ICURegionDataTables"); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static enum DataTableType { LANG, REGION; } 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 f3b004e09..c5373a172 100644 --- a/android_icu4j/src/main/java/android/icu/impl/Norm2AllModes.java +++ b/android_icu4j/src/main/java/android/icu/impl/Norm2AllModes.java @@ -24,6 +24,9 @@ public final class Norm2AllModes { // Public API dispatch via Normalizer2 subclasses -------------------------- *** // Normalizer2 implementation for the old UNORM_NONE. + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class NoopNormalizer2 extends Normalizer2 { @Override public StringBuilder normalize(CharSequence src, StringBuilder dest) { @@ -83,6 +86,9 @@ public final class Norm2AllModes { // Intermediate class: // Has Normalizer2Impl and does boilerplate argument checking and setup. + /** + * @hide Only a subset of ICU is exposed in Android + */ public static abstract class Normalizer2WithImpl extends Normalizer2 { public Normalizer2WithImpl(Normalizer2Impl ni) { impl=ni; @@ -166,6 +172,9 @@ public final class Norm2AllModes { public final Normalizer2Impl impl; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class DecomposeNormalizer2 extends Normalizer2WithImpl { public DecomposeNormalizer2(Normalizer2Impl ni) { super(ni); @@ -196,6 +205,9 @@ public final class Norm2AllModes { public boolean isInert(int c) { return impl.isDecompInert(c); } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class ComposeNormalizer2 extends Normalizer2WithImpl { public ComposeNormalizer2(Normalizer2Impl ni, boolean fcc) { super(ni); @@ -252,6 +264,9 @@ public final class Norm2AllModes { private final boolean onlyContiguous; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class FCDNormalizer2 extends Normalizer2WithImpl { public FCDNormalizer2(Normalizer2Impl ni) { super(ni); 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 4f07fb069..6a2ffe31d 100644 --- a/android_icu4j/src/main/java/android/icu/impl/Normalizer2Impl.java +++ b/android_icu4j/src/main/java/android/icu/impl/Normalizer2Impl.java @@ -28,6 +28,9 @@ import android.icu.util.VersionInfo; * @hide Only a subset of ICU is exposed in Android */ public final class Normalizer2Impl { + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class Hangul { /* Korean Hangul and Jamo constants */ public static final int JAMO_L_BASE=0x1100; /* "lead" jamo */ @@ -131,6 +134,7 @@ public final class Normalizer2Impl { * until no further changes are necessary and whole segments are appended. * append() methods that take combining-class values always write to the StringBuilder. * Other append() methods flush and append to the Appendable. + * @hide Only a subset of ICU is exposed in Android */ public static final class ReorderingBuffer implements Appendable { public ReorderingBuffer(Normalizer2Impl ni, Appendable dest, int destCapacity) { @@ -360,6 +364,9 @@ public final class Normalizer2Impl { // TODO: Propose as public API on the UTF16 class. // TODO: Propose widening UTF16 methods that take char to take int. // TODO: Propose widening UTF16 methods that take String to take CharSequence. + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class UTF16Plus { /** * Assuming c is a surrogate code point (UTF16.isSurrogate(c)), 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 24ea84e8e..ca208df65 100644 --- a/android_icu4j/src/main/java/android/icu/impl/PropsVectors.java +++ b/android_icu4j/src/main/java/android/icu/impl/PropsVectors.java @@ -557,6 +557,9 @@ public class PropsVectors { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface CompactHandler { public void setRowIndexForRange(int start, int end, int rowIndex); public void setRowIndexForInitialValue(int rowIndex); diff --git a/android_icu4j/src/main/java/android/icu/impl/RBBIDataWrapper.java b/android_icu4j/src/main/java/android/icu/impl/RBBIDataWrapper.java index 7b755f3e9..191022e19 100644 --- a/android_icu4j/src/main/java/android/icu/impl/RBBIDataWrapper.java +++ b/android_icu4j/src/main/java/android/icu/impl/RBBIDataWrapper.java @@ -31,6 +31,7 @@ public final class RBBIDataWrapper { * A RBBI State Transition table, the form of the data used at run time in Java. * These can be created from stored ICU data, or built from rules. * The structure corresponds closely to struct RBBIStateTable in ICU4C. + * @hide Only a subset of ICU is exposed in Android */ static public class RBBIStateTable { /** @@ -206,6 +207,7 @@ public final class RBBIDataWrapper { /** * Data Header. A struct-like class with the fields from the RBBI data file header. * Not intended for public use, declared public for testing purposes only. + * @hide Only a subset of ICU is exposed in Android */ public final static class RBBIDataHeader { int fMagic; // == 0xbla0 diff --git a/android_icu4j/src/main/java/android/icu/impl/RelativeDateFormat.java b/android_icu4j/src/main/java/android/icu/impl/RelativeDateFormat.java index 4262f57bb..7f7dc8a06 100644 --- a/android_icu4j/src/main/java/android/icu/impl/RelativeDateFormat.java +++ b/android_icu4j/src/main/java/android/icu/impl/RelativeDateFormat.java @@ -35,6 +35,7 @@ public class RelativeDateFormat extends DateFormat { /** * @author srl + * @hide Only a subset of ICU is exposed in Android * */ public static class URelativeString { 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 6fee12350..106f84a9f 100644 --- a/android_icu4j/src/main/java/android/icu/impl/Row.java +++ b/android_icu4j/src/main/java/android/icu/impl/Row.java @@ -39,21 +39,33 @@ public class Row<C0, C1, C2, C3, C4> implements java.lang.Comparable, Cloneable, return new R5<C0,C1,C2,C3,C4>(p0,p1,p2,p3,p4); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class R2<C0, C1> extends Row<C0, C1, C1, C1, C1> { public R2(C0 a, C1 b) { items = new Object[] {a, b}; } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class R3<C0, C1, C2> extends Row<C0, C1, C2, C2, C2> { public R3(C0 a, C1 b, C2 c) { items = new Object[] {a, b, c}; } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class R4<C0, C1, C2, C3> extends Row<C0, C1, C2, C3, C3> { public R4(C0 a, C1 b, C2 c, C3 d) { items = new Object[] {a, b, c, d}; } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class R5<C0, C1, C2, C3, C4> extends Row<C0, C1, C2, C3, C4> { public R5(C0 a, C1 b, C2 c, C3 d, C4 e) { items = new Object[] {a, b, c, d, e}; diff --git a/android_icu4j/src/main/java/android/icu/impl/SimpleFilteredSentenceBreakIterator.java b/android_icu4j/src/main/java/android/icu/impl/SimpleFilteredSentenceBreakIterator.java index ef10e3ffb..343dafec2 100644 --- a/android_icu4j/src/main/java/android/icu/impl/SimpleFilteredSentenceBreakIterator.java +++ b/android_icu4j/src/main/java/android/icu/impl/SimpleFilteredSentenceBreakIterator.java @@ -271,6 +271,9 @@ public class SimpleFilteredSentenceBreakIterator extends BreakIterator { delegate.setText(newText); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Builder extends FilteredBreakIteratorBuilder { /** * filter set to store all exceptions diff --git a/android_icu4j/src/main/java/android/icu/impl/StaticUnicodeSets.java b/android_icu4j/src/main/java/android/icu/impl/StaticUnicodeSets.java index 62c3ab93c..2e3a8c6af 100644 --- a/android_icu4j/src/main/java/android/icu/impl/StaticUnicodeSets.java +++ b/android_icu4j/src/main/java/android/icu/impl/StaticUnicodeSets.java @@ -25,6 +25,9 @@ import android.icu.util.UResourceBundle; * @hide Only a subset of ICU is exposed in Android */ public class StaticUnicodeSets { + /** + * @hide Only a subset of ICU is exposed in Android + */ public static enum Key { // Ignorables DEFAULT_IGNORABLES, 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 9b9261dee..36eb9d7c5 100644 --- a/android_icu4j/src/main/java/android/icu/impl/StringRange.java +++ b/android_icu4j/src/main/java/android/icu/impl/StringRange.java @@ -28,6 +28,9 @@ import android.icu.util.ICUException; public class StringRange { private static final boolean DEBUG = false; + /** + * @hide Only a subset of ICU is exposed in Android + */ public interface Adder { /** * @param start diff --git a/android_icu4j/src/main/java/android/icu/impl/TextTrieMap.java b/android_icu4j/src/main/java/android/icu/impl/TextTrieMap.java index 27b59b70b..5b0a315d8 100644 --- a/android_icu4j/src/main/java/android/icu/impl/TextTrieMap.java +++ b/android_icu4j/src/main/java/android/icu/impl/TextTrieMap.java @@ -27,6 +27,9 @@ public class TextTrieMap<V> { private Node _root = new Node(); boolean _ignoreCase; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Output { public int matchLength; public boolean partialMatch; @@ -121,6 +124,9 @@ public class TextTrieMap<V> { _root.putLeadCodePoints(output); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class CharIterator implements Iterator<Character> { private boolean _ignoreCase; private CharSequence _text; @@ -199,6 +205,7 @@ public class TextTrieMap<V> { /** * Callback handler for processing prefix matches used by * find method. + * @hide Only a subset of ICU is exposed in Android */ public interface ResultHandler<V> { /** diff --git a/android_icu4j/src/main/java/android/icu/impl/TimeZoneGenericNames.java b/android_icu4j/src/main/java/android/icu/impl/TimeZoneGenericNames.java index 47048d5df..fe4e3a4d5 100644 --- a/android_icu4j/src/main/java/android/icu/impl/TimeZoneGenericNames.java +++ b/android_icu4j/src/main/java/android/icu/impl/TimeZoneGenericNames.java @@ -55,6 +55,7 @@ public class TimeZoneGenericNames implements Serializable, Freezable<TimeZoneGen /** * Generic name type enum + * @hide Only a subset of ICU is exposed in Android */ public enum GenericNameType { LOCATION ("LONG", "SHORT"), @@ -79,6 +80,7 @@ public class TimeZoneGenericNames implements Serializable, Freezable<TimeZoneGen /** * Format pattern enum used for composing location and partial location names + * @hide Only a subset of ICU is exposed in Android */ public enum Pattern { // The format pattern such as "{0} Time", where {0} is the country or city. @@ -598,6 +600,7 @@ public class TimeZoneGenericNames implements Serializable, Freezable<TimeZoneGen /** * A class used for returning the name search result used by * {@link TimeZoneGenericNames#find(String, int, EnumSet)}. + * @hide Only a subset of ICU is exposed in Android */ public static class GenericMatchInfo { final GenericNameType nameType; diff --git a/android_icu4j/src/main/java/android/icu/impl/Trie.java b/android_icu4j/src/main/java/android/icu/impl/Trie.java index 3438ccf03..3c974fc88 100644 --- a/android_icu4j/src/main/java/android/icu/impl/Trie.java +++ b/android_icu4j/src/main/java/android/icu/impl/Trie.java @@ -55,6 +55,7 @@ public abstract class Trie * This interface specifies methods to be implemented in order for * com.ibm.impl.Trie, to surrogate offset information encapsulated within * the data. + * @hide Only a subset of ICU is exposed in Android */ public static interface DataManipulate { 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 b3badb785..ba675e198 100644 --- a/android_icu4j/src/main/java/android/icu/impl/Trie2.java +++ b/android_icu4j/src/main/java/android/icu/impl/Trie2.java @@ -338,6 +338,7 @@ public abstract class Trie2 implements Iterable<Trie2.Range> { * When iterating, the same Trie2EnumRange object will be reused and returned for each range. * If you need to retain complete iteration results, clone each returned Trie2EnumRange, * or save the range in some other way, before advancing to the next iteration step. + * @hide Only a subset of ICU is exposed in Android */ public static class Range { public int startCodePoint; @@ -454,6 +455,7 @@ public abstract class Trie2 implements Iterable<Trie2.Range> { * Trie2EnumRange r = i.next(); * ... // Do something with the range r. * } + * @hide Only a subset of ICU is exposed in Android * */ public interface ValueMapper { @@ -495,6 +497,7 @@ public abstract class Trie2 implements Iterable<Trie2.Range> { * Struct-like class for holding the results returned by a UTrie2 CharSequence iterator. * The iteration walks over a CharSequence, and for each Unicode code point therein * returns the character and its associated Trie2 value. + * @hide Only a subset of ICU is exposed in Android */ public static class CharSequenceValues { /** string index of the current code point. */ @@ -531,6 +534,7 @@ public abstract class Trie2 implements Iterable<Trie2.Range> { * Note that Trie2_16 and Trie2_32 subclass Trie2.CharSequenceIterator. This is done * only for performance reasons. It does require that any changes made here be propagated * into the corresponding code in the subclasses. + * @hide Only a subset of ICU is exposed in Android */ public class CharSequenceIterator implements Iterator<CharSequenceValues> { /** diff --git a/android_icu4j/src/main/java/android/icu/impl/TrieBuilder.java b/android_icu4j/src/main/java/android/icu/impl/TrieBuilder.java index e3d30dff4..f106ecbef 100644 --- a/android_icu4j/src/main/java/android/icu/impl/TrieBuilder.java +++ b/android_icu4j/src/main/java/android/icu/impl/TrieBuilder.java @@ -50,6 +50,7 @@ public class TrieBuilder * This interface specifies methods to be implemented in order for * com.ibm.impl.Trie, to surrogate offset information encapsulated within * the data. + * @hide Only a subset of ICU is exposed in Android */ public static interface DataManipulate { 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 3aa688382..997aabdf9 100644 --- a/android_icu4j/src/main/java/android/icu/impl/UCaseProps.java +++ b/android_icu4j/src/main/java/android/icu/impl/UCaseProps.java @@ -599,6 +599,7 @@ public final class UCaseProps { * * The code point being case-mapped itself is never returned by * this iterator. + * @hide Only a subset of ICU is exposed in Android */ public interface ContextIterator { /** 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 eb2b41935..007e2fe72 100644 --- a/android_icu4j/src/main/java/android/icu/impl/URLHandler.java +++ b/android_icu4j/src/main/java/android/icu/impl/URLHandler.java @@ -264,6 +264,9 @@ public abstract class URLHandler { public abstract void guide(URLVisitor visitor, boolean recurse, boolean strip); + /** + * @hide Only a subset of ICU is exposed in Android + */ public interface URLVisitor { void visit(String str); } diff --git a/android_icu4j/src/main/java/android/icu/impl/UResource.java b/android_icu4j/src/main/java/android/icu/impl/UResource.java index e8e6c30a6..0108910a5 100644 --- a/android_icu4j/src/main/java/android/icu/impl/UResource.java +++ b/android_icu4j/src/main/java/android/icu/impl/UResource.java @@ -27,6 +27,7 @@ public final class UResource { * Avoids object creations as much as possible. * Mutable, not thread-safe. * For permanent storage, use clone() or toString(). + * @hide Only a subset of ICU is exposed in Android */ public static final class Key implements CharSequence, Cloneable, Comparable<Key> { // Stores a reference to the resource bundle key string bytes array, @@ -272,6 +273,7 @@ public final class UResource { /** * Interface for iterating over a resource bundle array resource. * Does not use Java Iterator to reduce object creations. + * @hide Only a subset of ICU is exposed in Android */ public interface Array { /** @@ -289,6 +291,7 @@ public final class UResource { /** * Interface for iterating over a resource bundle table resource. * Does not use Java Iterator to reduce object creations. + * @hide Only a subset of ICU is exposed in Android */ public interface Table { /** @@ -308,6 +311,7 @@ public final class UResource { * Represents a resource bundle item's value. * Avoids object creations as much as possible. * Mutable, not thread-safe. + * @hide Only a subset of ICU is exposed in Android */ public static abstract class Value { protected Value() {} @@ -449,6 +453,7 @@ public final class UResource { /** * Sink for ICU resource bundle contents. + * @hide Only a subset of ICU is exposed in Android */ public static abstract class Sink { /** diff --git a/android_icu4j/src/main/java/android/icu/impl/ValidIdentifiers.java b/android_icu4j/src/main/java/android/icu/impl/ValidIdentifiers.java index 454cc2ada..fc5a97664 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ValidIdentifiers.java +++ b/android_icu4j/src/main/java/android/icu/impl/ValidIdentifiers.java @@ -28,6 +28,9 @@ import android.icu.util.UResourceBundleIterator; */ public class ValidIdentifiers { + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum Datatype { currency, language, @@ -42,6 +45,9 @@ public class ValidIdentifiers { illegal } + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum Datasubtype { deprecated, private_use, @@ -51,6 +57,9 @@ public class ValidIdentifiers { macroregion, } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ValiditySet { public final Set<String> regularData; public final Map<String,Set<String>> subdivisionData; 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 e7a3e542f..e18aff487 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 @@ -24,6 +24,9 @@ public final class CollationKeys /* all methods are static */ { // Java porting note: C++ SortKeyByteSink class extends a common class ByteSink, // which is not available in Java. We don't need a super class created for implementing // collation features. + /** + * @hide Only a subset of ICU is exposed in Android + */ public static abstract class SortKeyByteSink { protected byte[] buffer_; // protected int capacity_; == buffer_.length @@ -133,6 +136,9 @@ public final class CollationKeys /* all methods are static */ { protected abstract boolean Resize(int appendCapacity, int length); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class LevelCallback { /** * @param level 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 33ed4f504..ccd671698 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 @@ -38,6 +38,9 @@ public final class ContractionsAndExpansions { private String suffix; private long[] ces = new long[Collation.MAX_EXPANSION_LENGTH]; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface CESink { void handleCE(long ce); void handleExpansion(long ces[], int start, int length); diff --git a/android_icu4j/src/main/java/android/icu/impl/coll/SharedObject.java b/android_icu4j/src/main/java/android/icu/impl/coll/SharedObject.java index 121ea6d51..4cb7e1b2e 100644 --- a/android_icu4j/src/main/java/android/icu/impl/coll/SharedObject.java +++ b/android_icu4j/src/main/java/android/icu/impl/coll/SharedObject.java @@ -97,6 +97,7 @@ import android.icu.util.ICUCloneNotSupportedException; public class SharedObject implements Cloneable { /** * Similar to a smart pointer, basically a port of the static methods of C++ SharedObject. + * @hide Only a subset of ICU is exposed in Android */ public static final class Reference<T extends SharedObject> implements Cloneable { private T ref; diff --git a/android_icu4j/src/main/java/android/icu/impl/duration/impl/DataRecord.java b/android_icu4j/src/main/java/android/icu/impl/duration/impl/DataRecord.java index 62d690e61..4224365ff 100644 --- a/android_icu4j/src/main/java/android/icu/impl/duration/impl/DataRecord.java +++ b/android_icu4j/src/main/java/android/icu/impl/duration/impl/DataRecord.java @@ -175,6 +175,9 @@ public class DataRecord { out.close(); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ScopeData { String prefix; boolean requiresDigitPrefix; @@ -202,6 +205,9 @@ public class DataRecord { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface ETimeLimit { public static final byte NOLIMIT = 0; public static final byte LT = 1; @@ -209,6 +215,9 @@ public class DataRecord { public static final String[] names = { "NOLIMIT", "LT", "MT" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface ETimeDirection { public static final byte NODIRECTION = 0; public static final byte PAST = 1; @@ -216,6 +225,9 @@ public class DataRecord { public static final String[] names = { "NODIRECTION", "PAST", "FUTURE" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EUnitVariant { public static final byte PLURALIZED = 0; public static final byte MEDIUM = 1; @@ -223,6 +235,9 @@ public class DataRecord { public static final String[] names = { "PLURALIZED", "MEDIUM", "SHORT" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface ECountVariant { public static final byte INTEGER = 0; public static final byte INTEGER_CUSTOM = 1; @@ -234,6 +249,9 @@ public class DataRecord { "HALF_FRACTION", "DECIMAL1", "DECIMAL2", "DECIMAL3" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EPluralization { public static final byte NONE = 0; public static final byte PLURAL = 1; @@ -245,6 +263,9 @@ public class DataRecord { "PAUCAL", "HEBREW", "ARABIC" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EHalfPlacement { public static final byte PREFIX = 0; public static final byte AFTER_FIRST = 1; @@ -252,6 +273,9 @@ public class DataRecord { public static final String[] names = { "PREFIX", "AFTER_FIRST", "LAST" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface ENumberSystem { public static final byte DEFAULT = 0; public static final byte CHINESE_TRADITIONAL = 1; @@ -261,12 +285,18 @@ public class DataRecord { "CHINESE_TRADITIONAL", "CHINESE_SIMPLIFIED", "KOREAN" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EZeroHandling { public static final byte ZPLURAL = 0; public static final byte ZSINGULAR = 1; public static final String[] names = { "ZPLURAL", "ZSINGULAR" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EDecimalHandling { public static final byte DPLURAL = 0; public static final byte DSINGULAR = 1; @@ -276,6 +306,9 @@ public class DataRecord { "DSINGULAR_SUBONE", "DPAUCAL" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EFractionHandling { public static final byte FPLURAL = 0; public static final byte FSINGULAR_PLURAL = 1; @@ -285,6 +318,9 @@ public class DataRecord { "FSINGULAR_PLURAL_ANDAHALF", "FPAUCAL" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EHalfSupport { public static final byte YES = 0; public static final byte NO = 1; @@ -292,6 +328,9 @@ public class DataRecord { public static final String[] names = { "YES", "NO", "ONE_PLUS" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EMilliSupport { public static final byte YES = 0; public static final byte NO = 1; @@ -299,6 +338,9 @@ public class DataRecord { public static final String[] names = { "YES", "NO", "WITH_SECONDS" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface ESeparatorVariant { public static final byte NONE = 0; public static final byte SHORT = 1; @@ -306,6 +348,9 @@ public class DataRecord { public static final String[] names = { "NONE", "SHORT", "FULL" }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface EGender { public static final byte M = 0; public static final byte F = 1; 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 92d402e97..4e8216dd8 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 @@ -189,7 +189,10 @@ public class Utils { // } // } - public static class ChineseDigits { + /** + * @hide Only a subset of ICU is exposed in Android + */ +public static class ChineseDigits { final char[] digits; final char[] units; final char[] levels; 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 ba12476b7..d4b7fa475 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 @@ -165,6 +165,9 @@ public final class AsciiUtil { return b; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class CaseInsensitiveKey { private String _key; private int _hash; diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/KeyTypeData.java b/android_icu4j/src/main/java/android/icu/impl/locale/KeyTypeData.java index 95baa233e..65d811718 100644 --- a/android_icu4j/src/main/java/android/icu/impl/locale/KeyTypeData.java +++ b/android_icu4j/src/main/java/android/icu/impl/locale/KeyTypeData.java @@ -31,6 +31,9 @@ import android.icu.util.UResourceBundleIterator; */ public class KeyTypeData { + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum ValueType { single, multiple, incremental, any } diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleValidityChecker.java b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleValidityChecker.java index 8f01abdb6..e030116f1 100644 --- a/android_icu4j/src/main/java/android/icu/impl/locale/LocaleValidityChecker.java +++ b/android_icu4j/src/main/java/android/icu/impl/locale/LocaleValidityChecker.java @@ -31,6 +31,9 @@ import android.icu.util.ULocale; public class LocaleValidityChecker { private final Set<Datasubtype> datasubtypes; private final boolean allowsDeprecated; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Where { public Datatype fieldFailure; public String codeFailure; diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/XCldrStub.java b/android_icu4j/src/main/java/android/icu/impl/locale/XCldrStub.java index 65297e0ae..bc1a370f1 100644 --- a/android_icu4j/src/main/java/android/icu/impl/locale/XCldrStub.java +++ b/android_icu4j/src/main/java/android/icu/impl/locale/XCldrStub.java @@ -35,6 +35,9 @@ import android.icu.util.ICUUncheckedIOException; */ public class XCldrStub { + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Multimap<K, V> { private final Map<K,Set<V>> map; private final Class<Set<V>> setClass; @@ -125,6 +128,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Multimaps { public static <K, V, R extends Multimap<K, V>> R invertFrom(Multimap<V, K> source, R target) { for (Entry<V, Set<K>> entry : source.asMap().entrySet()) { @@ -196,6 +202,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class HashMultimap<K, V> extends Multimap<K, V> { private HashMultimap() { super(new HashMap<K, Set<V>>(), HashSet.class); @@ -205,6 +214,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class TreeMultimap<K, V> extends Multimap<K, V> { private TreeMultimap() { super(new TreeMap<K, Set<V>>(), TreeSet.class); @@ -214,6 +226,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class LinkedHashMultimap<K, V> extends Multimap<K, V> { private LinkedHashMultimap() { super(new LinkedHashMap<K, Set<V>>(), LinkedHashSet.class); @@ -260,12 +275,18 @@ public class XCldrStub { return result.toString(); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class CollectionUtilities { public static <T, U extends Iterable<T>> String join(U source, String separator) { return XCldrStub.join(source, separator); } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Joiner { private final String separator; private Joiner(String separator) { @@ -282,6 +303,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Splitter { Pattern pattern; boolean trimResults = false; @@ -315,16 +339,25 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ImmutableSet { public static <T> Set<T> copyOf(Set<T> values) { return Collections.unmodifiableSet(new LinkedHashSet<T>(values)); // copy set for safety, preserve order } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ImmutableMap { public static <K,V> Map<K,V> copyOf(Map<K,V> values) { return Collections.unmodifiableMap(new LinkedHashMap<K,V>(values)); // copy set for safety, preserve order } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ImmutableMultimap { public static <K,V> Multimap<K,V> copyOf(Multimap<K,V> values) { LinkedHashMap<K, Set<V>> temp = new LinkedHashMap<K,Set<V>>(); // semi-deep copy, preserve order @@ -338,6 +371,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class FileUtilities { public static final Charset UTF8 = Charset.forName("utf-8"); @@ -384,6 +420,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ static public class RegexUtilities { public static int findMismatch(Matcher m, CharSequence s) { int i; @@ -402,6 +441,9 @@ public class XCldrStub { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public interface Predicate<T> { /** * Evaluates this predicate on the given argument. diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/XLikelySubtags.java b/android_icu4j/src/main/java/android/icu/impl/locale/XLikelySubtags.java index 9c05e28d6..5837351b1 100644 --- a/android_icu4j/src/main/java/android/icu/impl/locale/XLikelySubtags.java +++ b/android_icu4j/src/main/java/android/icu/impl/locale/XLikelySubtags.java @@ -61,6 +61,9 @@ public class XLikelySubtags { }; } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Aliases { final Map<String, String> toCanonical; final Multimap<String, String> toAliases; @@ -103,6 +106,9 @@ public class XLikelySubtags { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class LSR { public final String language; public final String script; diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleDistance.java b/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleDistance.java index 488c33af7..568f1caa2 100644 --- a/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleDistance.java +++ b/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleDistance.java @@ -203,6 +203,9 @@ public class XLocaleDistance { private final int defaultScriptDistance; private final int defaultRegionDistance; + /** + * @hide Only a subset of ICU is exposed in Android + */ @Deprecated public static abstract class DistanceTable { abstract int getDistance(String desiredLang, String supportedlang, Output<DistanceTable> table, boolean starEquals); @@ -225,6 +228,9 @@ public class XLocaleDistance { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ @Deprecated public static class DistanceNode { final int distance; @@ -413,6 +419,7 @@ public class XLocaleDistance { /** * Internal class + * @hide Only a subset of ICU is exposed in Android */ @Deprecated public static class StringDistanceTable extends DistanceTable { @@ -736,6 +743,9 @@ public class XLocaleDistance { threshold, distanceOption); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum DistanceOption {NORMAL, SCRIPT_FIRST} /** diff --git a/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleMatcher.java b/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleMatcher.java index a5e142183..79d19adc9 100644 --- a/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleMatcher.java +++ b/android_icu4j/src/main/java/android/icu/impl/locale/XLocaleMatcher.java @@ -43,6 +43,9 @@ public class XLocaleMatcher { private final ULocale defaultLanguage; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class Builder { private Set<ULocale> supportedLanguagesList; private int thresholdDistance = -1; diff --git a/android_icu4j/src/main/java/android/icu/impl/number/AffixPatternProvider.java b/android_icu4j/src/main/java/android/icu/impl/number/AffixPatternProvider.java index 1f08c3702..38dcf8a90 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/AffixPatternProvider.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/AffixPatternProvider.java @@ -7,6 +7,9 @@ package android.icu.impl.number; * @hide Only a subset of ICU is exposed in Android */ public interface AffixPatternProvider { + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class Flags { public static final int PLURAL_MASK = 0xff; public static final int PREFIX = 0x100; diff --git a/android_icu4j/src/main/java/android/icu/impl/number/AffixUtils.java b/android_icu4j/src/main/java/android/icu/impl/number/AffixUtils.java index c69b5d612..6cd0ba807 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/AffixUtils.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/AffixUtils.java @@ -107,10 +107,16 @@ public class AffixUtils { /** Represents a sequence of six or more currency symbols. */ public static final int TYPE_CURRENCY_OVERFLOW = -15; + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface SymbolProvider { public CharSequence getSymbol(int type); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static interface TokenConsumer { public void consumeToken(int typeOrCp); } diff --git a/android_icu4j/src/main/java/android/icu/impl/number/CompactData.java b/android_icu4j/src/main/java/android/icu/impl/number/CompactData.java index 6e145f7c9..eaaf9f2da 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/CompactData.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/CompactData.java @@ -22,6 +22,9 @@ import android.icu.util.UResourceBundle; */ public class CompactData implements MultiplierProducer { + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum CompactType { DECIMAL, CURRENCY } diff --git a/android_icu4j/src/main/java/android/icu/impl/number/DecimalFormatProperties.java b/android_icu4j/src/main/java/android/icu/impl/number/DecimalFormatProperties.java index 33582c4fc..2f12241de 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/DecimalFormatProperties.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/DecimalFormatProperties.java @@ -33,7 +33,8 @@ public class DecimalFormatProperties implements Cloneable, Serializable { /** Auto-generated. */ private static final long serialVersionUID = 4095518955889349243L; - /** Controls the set of rules for parsing a string from the old DecimalFormat API. */ + /** Controls the set of rules for parsing a string from the old DecimalFormat API. + * @hide Only a subset of ICU is exposed in Android*/ public static enum ParseMode { /** * Lenient mode should be used if you want to accept malformed user input. It will use heuristics diff --git a/android_icu4j/src/main/java/android/icu/impl/number/MutablePatternModifier.java b/android_icu4j/src/main/java/android/icu/impl/number/MutablePatternModifier.java index 4862fd1f7..1e7a7f5bf 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/MutablePatternModifier.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/MutablePatternModifier.java @@ -214,6 +214,9 @@ public class MutablePatternModifier implements Modifier, SymbolProvider, MicroPr } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ImmutablePatternModifier implements MicroPropsGenerator { final ParameterizedModifier pm; final PluralRules rules; diff --git a/android_icu4j/src/main/java/android/icu/impl/number/Padder.java b/android_icu4j/src/main/java/android/icu/impl/number/Padder.java index 6d9382297..d197975f9 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/Padder.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/Padder.java @@ -9,6 +9,9 @@ package android.icu.impl.number; public class Padder { public static final String FALLBACK_PADDING_STRING = "\u0020"; // i.e. a space + /** + * @hide Only a subset of ICU is exposed in Android + */ public enum PadPosition { BEFORE_PREFIX, AFTER_PREFIX, BEFORE_SUFFIX, AFTER_SUFFIX; diff --git a/android_icu4j/src/main/java/android/icu/impl/number/PatternStringParser.java b/android_icu4j/src/main/java/android/icu/impl/number/PatternStringParser.java index 6c5b3a244..04f418967 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/PatternStringParser.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/PatternStringParser.java @@ -85,6 +85,7 @@ public class PatternStringParser { /** * Contains raw information about the parsed decimal format pattern string. + * @hide Only a subset of ICU is exposed in Android */ public static class ParsedPatternInfo implements AffixPatternProvider { public String pattern; @@ -178,6 +179,9 @@ public class PatternStringParser { } } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static class ParsedSubpatternInfo { public long groupingSizes = 0x0000ffffffff0000L; public int integerLeadingHashSigns = 0; diff --git a/android_icu4j/src/main/java/android/icu/impl/number/parse/NumberParseMatcher.java b/android_icu4j/src/main/java/android/icu/impl/number/parse/NumberParseMatcher.java index 3e7d6ac89..5b5531b7b 100644 --- a/android_icu4j/src/main/java/android/icu/impl/number/parse/NumberParseMatcher.java +++ b/android_icu4j/src/main/java/android/icu/impl/number/parse/NumberParseMatcher.java @@ -26,6 +26,7 @@ public interface NumberParseMatcher { /** * Matchers can implement the Flexible interface to indicate that they are optional and can be run * repeatedly. Used by SeriesMatcher, primarily in the context of IgnorablesMatcher. + * @hide Only a subset of ICU is exposed in Android */ public interface Flexible { } diff --git a/android_icu4j/src/main/java/android/icu/number/NumberFormatter.java b/android_icu4j/src/main/java/android/icu/number/NumberFormatter.java index 6a144afb2..ea69a25dc 100644 --- a/android_icu4j/src/main/java/android/icu/number/NumberFormatter.java +++ b/android_icu4j/src/main/java/android/icu/number/NumberFormatter.java @@ -84,6 +84,7 @@ public final class NumberFormatter { * This enum is similar to {@link android.icu.text.MeasureFormat.FormatWidth}. * * @see NumberFormatter + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static enum UnitWidth { @@ -179,6 +180,7 @@ public final class NumberFormatter { * grouping separator, use the "symbols" setter. * * @see NumberFormatter + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static enum GroupingStrategy { @@ -268,6 +270,7 @@ public final class NumberFormatter { * The exact format, including the position and the code point of the sign, differ by locale. * * @see NumberFormatter + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static enum SignDisplay { @@ -356,6 +359,7 @@ public final class NumberFormatter { * </ul> * * @see NumberFormatter + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static enum DecimalSeparatorDisplay { diff --git a/android_icu4j/src/main/java/android/icu/text/BidiTransform.java b/android_icu4j/src/main/java/android/icu/text/BidiTransform.java index fb9aa5fd3..92fe88bae 100644 --- a/android_icu4j/src/main/java/android/icu/text/BidiTransform.java +++ b/android_icu4j/src/main/java/android/icu/text/BidiTransform.java @@ -52,6 +52,7 @@ public class BidiTransform * @see Bidi#REORDER_DEFAULT * @see Bidi#REORDER_INVERSE_LIKE_DIRECT * @see Bidi#REORDER_RUNS_ONLY + * @hide Only a subset of ICU is exposed in Android */ public enum Order { /** @@ -73,6 +74,7 @@ public class BidiTransform * @see Bidi#setReorderingOptions * @see Bidi#writeReordered * @see Bidi#writeReverse + * @hide Only a subset of ICU is exposed in Android */ public enum Mirroring { /** 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 82dd6d3af..7b6495c63 100644 --- a/android_icu4j/src/main/java/android/icu/text/ChineseDateFormat.java +++ b/android_icu4j/src/main/java/android/icu/text/ChineseDateFormat.java @@ -181,6 +181,7 @@ public class ChineseDateFormat extends SimpleDateFormat { * constants defined here. * <p> * @deprecated ICU 50 + * @hide Only a subset of ICU is exposed in Android */ @Deprecated public static class Field extends DateFormat.Field { 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 f32c98d69..f8aaedcea 100644 --- a/android_icu4j/src/main/java/android/icu/text/CurrencyMetaInfo.java +++ b/android_icu4j/src/main/java/android/icu/text/CurrencyMetaInfo.java @@ -75,6 +75,7 @@ public class CurrencyMetaInfo { /** * A filter used to select which currency info is returned. + * @hide Only a subset of ICU is exposed in Android */ public static final class CurrencyFilter { /** @@ -341,6 +342,7 @@ public class CurrencyMetaInfo { /** * Represents the raw information about fraction digits and rounding increment. + * @hide Only a subset of ICU is exposed in Android */ public static final class CurrencyDigits { /** @@ -377,6 +379,7 @@ public class CurrencyMetaInfo { * and priority. * Use {@link CurrencyMetaInfo#currencyInfo(CurrencyFilter)} * for a list of info objects matching the filter. + * @hide Only a subset of ICU is exposed in Android */ public static final class CurrencyInfo { /** 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 9527cc7d6..e16227865 100644 --- a/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java +++ b/android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java @@ -1089,6 +1089,7 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera /** * Field display name width constants for getFieldDisplayName + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public enum DisplayWidth { @@ -1371,6 +1372,7 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera * is "44". * * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -1492,6 +1494,7 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera } * </pre> * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @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 d8682ada1..7df567c34 100644 --- a/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java +++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java @@ -2399,6 +2399,7 @@ public class DecimalFormat extends NumberFormat { /** * @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 */ @Deprecated 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 3426648e5..14b86d9e4 100644 --- a/android_icu4j/src/main/java/android/icu/text/ListFormatter.java +++ b/android_icu4j/src/main/java/android/icu/text/ListFormatter.java @@ -42,6 +42,7 @@ final public class ListFormatter { /** * Indicates the style of Listformatter * @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 */ @Deprecated diff --git a/android_icu4j/src/main/java/android/icu/text/MessagePatternUtil.java b/android_icu4j/src/main/java/android/icu/text/MessagePatternUtil.java index 3f5eb873f..10eee4b43 100644 --- a/android_icu4j/src/main/java/android/icu/text/MessagePatternUtil.java +++ b/android_icu4j/src/main/java/android/icu/text/MessagePatternUtil.java @@ -67,6 +67,7 @@ public final class MessagePatternUtil { * Common base class for all elements in a tree of nodes * returned by {@link MessagePatternUtil#buildMessageNode(MessagePattern)}. * This class and all subclasses are immutable and thread-safe. + * @hide Only a subset of ICU is exposed in Android */ public static class Node { private Node() {} @@ -74,6 +75,7 @@ public final class MessagePatternUtil { /** * A Node representing a parsed MessageFormat pattern string. + * @hide Only a subset of ICU is exposed in Android */ public static class MessageNode extends Node { /** @@ -116,10 +118,12 @@ public final class MessagePatternUtil { /** * A piece of MessageNode contents. * Use getType() to determine the type and the actual Node subclass. + * @hide Only a subset of ICU is exposed in Android */ public static class MessageContentsNode extends Node { /** * The type of a piece of MessageNode contents. + * @hide Only a subset of ICU is exposed in Android */ public enum Type { /** @@ -168,6 +172,7 @@ public final class MessagePatternUtil { /** * Literal text, a piece of MessageNode contents. + * @hide Only a subset of ICU is exposed in Android */ public static class TextNode extends MessageContentsNode { /** @@ -194,6 +199,7 @@ public final class MessagePatternUtil { /** * A piece of MessageNode contents representing a message argument and its details. + * @hide Only a subset of ICU is exposed in Android */ public static class ArgNode extends MessageContentsNode { /** @@ -272,6 +278,7 @@ public final class MessagePatternUtil { /** * A Node representing details of the argument style of a complex argument. * (Which is a choice/plural/select argument which selects among nested messages.) + * @hide Only a subset of ICU is exposed in Android */ public static class ComplexArgStyleNode extends Node { /** @@ -369,6 +376,7 @@ public final class MessagePatternUtil { /** * A Node representing a nested message (nested inside an argument) * with its selection criterium. + * @hide Only a subset of ICU is exposed in Android */ public static class VariantNode extends Node { /** 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 4414cfec3..5a8ae5072 100644 --- a/android_icu4j/src/main/java/android/icu/text/Normalizer.java +++ b/android_icu4j/src/main/java/android/icu/text/Normalizer.java @@ -226,6 +226,7 @@ public final class Normalizer implements Cloneable { * and any fields or methods should not be called or overridden by users. * * @deprecated ICU 56 Use {@link Normalizer2} instead. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration */ @Deprecated 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 c2e4a6c1f..f0e13bbd6 100644 --- a/android_icu4j/src/main/java/android/icu/text/NumberFormat.java +++ b/android_icu4j/src/main/java/android/icu/text/NumberFormat.java @@ -759,6 +759,7 @@ public abstract class NumberFormat extends UFormat { * one of these two methods <b>MUST</b> be overridden or else an infinite * loop will occur. * + * @hide Only a subset of ICU is exposed in Android * @hide unsupported on Android */ public static abstract class NumberFormatFactory { @@ -843,6 +844,7 @@ public abstract class NumberFormat extends UFormat { /** * A NumberFormatFactory that supports a single locale. It can be visible or invisible. + * @hide Only a subset of ICU is exposed in Android * @hide unsupported on Android */ public static abstract class SimpleNumberFormatFactory extends NumberFormatFactory { 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 228fb089f..16e9cd572 100644 --- a/android_icu4j/src/main/java/android/icu/text/PluralRules.java +++ b/android_icu4j/src/main/java/android/icu/text/PluralRules.java @@ -195,6 +195,7 @@ public class PluralRules implements Serializable { * Provides a factory for returning plural rules * * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -410,6 +411,7 @@ public class PluralRules implements Serializable { /** * @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 */ @Deprecated @@ -488,6 +490,7 @@ public class PluralRules implements Serializable { * An interface to FixedDecimal, allowing for other implementations. * * @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 */ @Deprecated @@ -519,6 +522,7 @@ public class PluralRules implements Serializable { /** * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -1028,6 +1032,7 @@ public class PluralRules implements Serializable { /** * Selection parameter for either integer-only or decimal-only. * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -1050,6 +1055,7 @@ public class PluralRules implements Serializable { /** * A range of NumberInfo that includes all values with the same visibleFractionDigitCount. * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -1097,6 +1103,7 @@ public class PluralRules implements Serializable { /** * A list of NumberInfo that includes all values with the same visibleFractionDigitCount. * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -2358,6 +2365,7 @@ public class PluralRules implements Serializable { /** * Status of the keyword for the rules, given a set of explicit values. * + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public enum KeywordStatus { 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 da905b25f..6e2962ae2 100644 --- a/android_icu4j/src/main/java/android/icu/text/SpoofChecker.java +++ b/android_icu4j/src/main/java/android/icu/text/SpoofChecker.java @@ -215,6 +215,8 @@ public class SpoofChecker { /** * Constants from UTS 39 for use in setRestrictionLevel. + * + * @hide Only a subset of ICU is exposed in Android */ public enum RestrictionLevel { /** @@ -462,6 +464,8 @@ public class SpoofChecker { /** * SpoofChecker Builder. To create a SpoofChecker, first instantiate a SpoofChecker.Builder, set the desired * checking options on the builder, then call the build() function to create a SpoofChecker instance. + * + * @hide Only a subset of ICU is exposed in Android */ public static class Builder { int fChecks; // Bit vector of checks to perform. @@ -1148,6 +1152,8 @@ public class SpoofChecker { /** * A struct-like class to hold the results of a Spoof Check operation. Tells which check(s) have failed. + * + * @hide Only a subset of ICU is exposed in Android */ public static class CheckResult { /** 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 1e7fe6b34..a41964320 100644 --- a/android_icu4j/src/main/java/android/icu/text/StringSearch.java +++ b/android_icu4j/src/main/java/android/icu/text/StringSearch.java @@ -1822,6 +1822,9 @@ public final class StringSearch extends SearchIterator { return ((ce & CONTINUATION_MARKER) == CONTINUATION_MARKER); } + /** + * @hide Only a subset of ICU is exposed in Android + */ public static final class Range { int ixLow_; int ixHigh_; 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 0f5090961..2dddf8e4a 100644 --- a/android_icu4j/src/main/java/android/icu/text/TimeZoneNames.java +++ b/android_icu4j/src/main/java/android/icu/text/TimeZoneNames.java @@ -320,6 +320,7 @@ public abstract class TimeZoneNames implements Serializable { /** * A <code>MatchInfo</code> represents a time zone name match used by * {@link TimeZoneNames#find(CharSequence, int, EnumSet)}. + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static class MatchInfo { @@ -450,6 +451,7 @@ public abstract class TimeZoneNames implements Serializable { * The super class of <code>TimeZoneNames</code> service factory classes. * * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ @@ -572,6 +574,7 @@ public abstract class TimeZoneNames implements Serializable { /** * The default <code>TimeZoneNames</code> factory called from {@link TimeZoneNames#getInstance(ULocale)} when * the ICU4J tznamedata component is not available. + * @hide Only a subset of ICU is exposed in Android */ public static class FactoryImpl extends Factory { 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 54c44d332..d5b890cf5 100644 --- a/android_icu4j/src/main/java/android/icu/text/Transliterator.java +++ b/android_icu4j/src/main/java/android/icu/text/Transliterator.java @@ -262,6 +262,7 @@ public abstract class Transliterator implements StringTransform { * boundaries. That is, none of them may occur between two code units * of a surrogate pair. If any index does split a surrogate pair, * results are unspecified. + * @hide Only a subset of ICU is exposed in Android */ public static class Position { @@ -1947,6 +1948,7 @@ public abstract class Transliterator implements StringTransform { * makes it possible to register one factory method to more than * one ID, or for a factory method to parameterize its result * based on the variant. + * @hide Only a subset of ICU is exposed in Android */ public static interface Factory { /** diff --git a/android_icu4j/src/main/java/android/icu/text/UTF16.java b/android_icu4j/src/main/java/android/icu/text/UTF16.java index adc707a35..b7a6072da 100644 --- a/android_icu4j/src/main/java/android/icu/text/UTF16.java +++ b/android_icu4j/src/main/java/android/icu/text/UTF16.java @@ -2258,6 +2258,7 @@ public final class UTF16 { * * @see #FOLD_CASE_DEFAULT * @see #FOLD_CASE_EXCLUDE_SPECIAL_I + * @hide Only a subset of ICU is exposed in Android */ public static final class StringComparator implements java.util.Comparator<String> { // public constructor ------------------------------------------------ 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 83fce1e93..a919caf86 100644 --- a/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java +++ b/android_icu4j/src/main/java/android/icu/text/UnicodeSet.java @@ -3835,6 +3835,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable<String>, Compa * Internal class for customizing UnicodeSet parsing of properties. * TODO: extend to allow customizing of codepoint ranges * @author medavis + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ abstract public static class XSymbolTable implements SymbolTable { diff --git a/android_icu4j/src/main/java/android/icu/util/BytesTrie.java b/android_icu4j/src/main/java/android/icu/util/BytesTrie.java index 8dc8e225e..019d2ce31 100644 --- a/android_icu4j/src/main/java/android/icu/util/BytesTrie.java +++ b/android_icu4j/src/main/java/android/icu/util/BytesTrie.java @@ -71,6 +71,7 @@ public final class BytesTrie implements Cloneable, Iterable<BytesTrie.Entry> { /** * BytesTrie state object, for saving a trie's current state * and resetting the trie back to this state later. + * @hide Only a subset of ICU is exposed in Android */ public static final class State { /** @@ -118,6 +119,7 @@ public final class BytesTrie implements Cloneable, Iterable<BytesTrie.Entry> { /** * Return values for BytesTrie.next(), CharsTrie.next() and similar methods. + * @hide Only a subset of ICU is exposed in Android */ public enum Result { /** @@ -430,6 +432,7 @@ public final class BytesTrie implements Cloneable, Iterable<BytesTrie.Entry> { /** * Return value type for the Iterator. + * @hide Only a subset of ICU is exposed in Android */ public static final class Entry { private Entry(int capacity) { @@ -490,6 +493,7 @@ public final class BytesTrie implements Cloneable, Iterable<BytesTrie.Entry> { /** * Iterator for all of the (byte sequence, value) pairs in a BytesTrie. + * @hide Only a subset of ICU is exposed in Android */ public static final class Iterator implements java.util.Iterator<Entry> { private Iterator(byte[] trieBytes, int offset, int remainingMatchLength, int maxStringLength) { 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 90f6584ec..c3ed99c42 100644 --- a/android_icu4j/src/main/java/android/icu/util/Calendar.java +++ b/android_icu4j/src/main/java/android/icu/util/Calendar.java @@ -3672,6 +3672,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca * SimpleDateFormat factory method. * * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ diff --git a/android_icu4j/src/main/java/android/icu/util/CharsTrie.java b/android_icu4j/src/main/java/android/icu/util/CharsTrie.java index 6c366b08e..85964f7a5 100644 --- a/android_icu4j/src/main/java/android/icu/util/CharsTrie.java +++ b/android_icu4j/src/main/java/android/icu/util/CharsTrie.java @@ -74,6 +74,7 @@ public final class CharsTrie implements Cloneable, Iterable<CharsTrie.Entry> { /** * CharsTrie state object, for saving a trie's current state * and resetting the trie back to this state later. + * @hide Only a subset of ICU is exposed in Android */ public static final class State { /** @@ -398,6 +399,7 @@ public final class CharsTrie implements Cloneable, Iterable<CharsTrie.Entry> { /** * Return value type for the Iterator. + * @hide Only a subset of ICU is exposed in Android */ public static final class Entry { /** @@ -415,6 +417,7 @@ public final class CharsTrie implements Cloneable, Iterable<CharsTrie.Entry> { /** * Iterator for all of the (string, value) pairs in a CharsTrie. + * @hide Only a subset of ICU is exposed in Android */ public static final class Iterator implements java.util.Iterator<Entry> { private Iterator(CharSequence trieChars, int offset, int remainingMatchLength, int maxStringLength) { 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 dbc990d5b..b2f50854e 100644 --- a/android_icu4j/src/main/java/android/icu/util/Currency.java +++ b/android_icu4j/src/main/java/android/icu/util/Currency.java @@ -766,6 +766,7 @@ public class Currency extends MeasureUnit { /** * @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 */ @Deprecated 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 5ba2fa18e..415f4cd80 100644 --- a/android_icu4j/src/main/java/android/icu/util/GenderInfo.java +++ b/android_icu4j/src/main/java/android/icu/util/GenderInfo.java @@ -36,6 +36,7 @@ public class GenderInfo { /** * Gender: OTHER means either the information is unavailable, or the person has declined to state MALE or FEMALE. * @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 */ @Deprecated @@ -87,6 +88,7 @@ public class GenderInfo { * 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. * @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 */ @Deprecated 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 e98bde946..c212388de 100644 --- a/android_icu4j/src/main/java/android/icu/util/LocaleMatcher.java +++ b/android_icu4j/src/main/java/android/icu/util/LocaleMatcher.java @@ -608,6 +608,7 @@ public class LocaleMatcher { /** * Only for testing and use by tools. Interface may change!! * @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 */ @Deprecated diff --git a/android_icu4j/src/main/java/android/icu/util/LocalePriorityList.java b/android_icu4j/src/main/java/android/icu/util/LocalePriorityList.java index ce6fb5671..bb27504e7 100644 --- a/android_icu4j/src/main/java/android/icu/util/LocalePriorityList.java +++ b/android_icu4j/src/main/java/android/icu/util/LocalePriorityList.java @@ -192,6 +192,7 @@ public class LocalePriorityList implements Iterable<ULocale> { /** * Class used for building LanguagePriorityLists + * @hide Only a subset of ICU is exposed in Android */ public static class Builder { /** diff --git a/android_icu4j/src/main/java/android/icu/util/Region.java b/android_icu4j/src/main/java/android/icu/util/Region.java index c38d49e56..d317db0e7 100644 --- a/android_icu4j/src/main/java/android/icu/util/Region.java +++ b/android_icu4j/src/main/java/android/icu/util/Region.java @@ -65,6 +65,8 @@ public class Region implements Comparable<Region> { /** * RegionType is an enumeration defining the different types of regions. Current possible * values are WORLD, CONTINENT, SUBCONTINENT, TERRITORY, GROUPING, DEPRECATED, and UNKNOWN. + * + * @hide Only a subset of ICU is exposed in Android */ @libcore.api.CorePlatformApi 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 c36649478..4e433221c 100644 --- a/android_icu4j/src/main/java/android/icu/util/StringTrieBuilder.java +++ b/android_icu4j/src/main/java/android/icu/util/StringTrieBuilder.java @@ -26,6 +26,7 @@ import java.util.HashMap; public abstract class StringTrieBuilder { /** * Build options for BytesTrieBuilder and CharsTrieBuilder. + * @hide Only a subset of ICU is exposed in Android */ public enum Option { /** 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 68d36815b..389c43108 100644 --- a/android_icu4j/src/main/java/android/icu/util/ULocale.java +++ b/android_icu4j/src/main/java/android/icu/util/ULocale.java @@ -1868,6 +1868,7 @@ public final class ULocale implements Serializable, Comparable<ULocale> { * @see android.icu.util.ULocale * @see android.icu.util.ULocale#ACTUAL_LOCALE * @see android.icu.util.ULocale#VALID_LOCALE + * @hide Only a subset of ICU is exposed in Android * @hide draft / provisional / internal are hidden on Android */ public static final class Type { @@ -2352,6 +2353,7 @@ public final class ULocale implements Serializable, Comparable<ULocale> { /** * Options for minimizeSubtags. * @deprecated This API is ICU internal only. + * @hide Only a subset of ICU is exposed in Android * @hide original deprecated declaration * @hide draft / provisional / internal are hidden on Android */ |