diff options
author | Victor Chang <vichang@google.com> | 2021-11-19 15:41:45 +0000 |
---|---|---|
committer | Victor Chang <vichang@google.com> | 2021-11-26 11:27:05 +0000 |
commit | 5dca02a301337ce3f5cc2edcd48c5f1210ff74e8 (patch) | |
tree | df251832c1727906a9268b9bef2f2ef6890e4887 | |
parent | e2acb02017f6c9f88705841088f8510810089915 (diff) | |
download | icu-5dca02a301337ce3f5cc2edcd48c5f1210ff74e8.tar.gz |
Regenerate java doc patches
Test: n/a
Change-Id: I36d70352ac6d0a90a0fcd1753902e4a16571867d
2 files changed, 14 insertions, 24 deletions
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch index 443861c22..a6678f6b8 100644 --- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch +++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch @@ -1,6 +1,6 @@ ---- android_icu4j/src/main/java/android/icu/lang/UCharacter.java 2021-01-19 16:26:24.362648532 +0000 -+++ android_icu4j/src/main/java/android/icu/lang/UCharacter.java 2021-01-19 16:26:50.790836134 +0000 -@@ -53,16 +53,6 @@ +--- android_icu4j/src/main/java/android/icu/lang/UCharacter.java 2021-11-19 15:35:27.250742750 +0000 ++++ android_icu4j/src/main/java/android/icu/lang/UCharacter.java 2021-11-19 15:40:24.805136914 +0000 +@@ -54,16 +54,6 @@ * more convenient in Java to have a separate primitive datatype for them, * ints suffice in the meantime. * @@ -17,19 +17,19 @@ * <p>Aside from the additions for UTF-16 support, and the updated Unicode * properties, the main differences between UCharacter and Character are: * <ul> -@@ -84,11 +74,6 @@ +@@ -85,11 +75,6 @@ * as having numeric values. This is a semantic change from ICU4J 1.3.1. * </ul> * <p> - * Further detail on differences can be determined using the program - * <a href= -- * "http://source.icu-project.org/repos/icu/icu4j/trunk/src/com/ibm/icu/dev/test/lang/UCharacterCompare.java"> +- * "https://github.com/unicode-org/icu/blob/main/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCompare.java"> - * android.icu.dev.test.lang.UCharacterCompare</a> - * <p> * In addition to Java compatibility functions, which calculate derived properties, * this API provides low-level access to the Unicode Character Database. * <p> -@@ -5209,7 +5194,6 @@ +@@ -5306,7 +5291,6 @@ * Unicode version does not have data for the property at all, or * not for this code point. * @see android.icu.lang.UProperty @@ -37,7 +37,7 @@ */ public static boolean hasBinaryProperty(int ch, int property) { -@@ -5298,7 +5282,6 @@ +@@ -5432,7 +5416,6 @@ * @see #hasBinaryProperty * @see #getIntPropertyMinValue * @see #getIntPropertyMaxValue diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/ULocale.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/ULocale.java.patch index d998b918b..a97738887 100644 --- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/ULocale.java.patch +++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/ULocale.java.patch @@ -1,6 +1,6 @@ ---- android_icu4j/src/main/java/android/icu/util/ULocale.java 2021-01-19 16:26:23.266640752 +0000 -+++ android_icu4j/src/main/java/android/icu/util/ULocale.java 2021-01-19 16:26:51.470840961 +0000 -@@ -93,19 +93,6 @@ +--- android_icu4j/src/main/java/android/icu/util/ULocale.java 2021-11-19 15:34:59.814522153 +0000 ++++ android_icu4j/src/main/java/android/icu/util/ULocale.java 2021-11-19 15:40:25.229140343 +0000 +@@ -92,19 +92,6 @@ * to canonical form, or the <code>canonicalInstance</code> factory method * can be called. * @@ -20,17 +20,7 @@ * <p>Note: The <i>actual</i> locale is returned correctly, but the <i>valid</i> * locale is not, in most cases. * -@@ -795,8 +782,7 @@ - * <strong>[icu] Note:</strong> Unlike the Locale API, this returns an array of <code>ULocale</code>, - * not <code>Locale</code>. - * -- * <p>Returns a list of all installed locales. This is equivalent to calling -- * {@link #getAvailableLocalesByType} with AvialableType.DEFAULT. -+ * <p>Returns a list of all installed locales. - */ - public static ULocale[] getAvailableLocales() { - return ICUResourceBundle.getAvailableULocales().clone(); -@@ -2307,15 +2293,11 @@ +@@ -2431,15 +2418,11 @@ * availableLocales matched). No ULocale array element should be null; behavior is * undefined if this is the case. * @@ -46,7 +36,7 @@ */ public static ULocale acceptLanguage(String acceptLanguageList, ULocale[] availableLocales, boolean[] fallback) { -@@ -2352,14 +2334,11 @@ +@@ -2476,14 +2459,11 @@ * locale was used as a fallback (because nothing else in availableLocales matched). * No ULocale array element should be null; behavior is undefined if this is the case. * @@ -61,7 +51,7 @@ */ public static ULocale acceptLanguage(ULocale[] acceptLanguageList, ULocale[] availableLocales, -@@ -2398,15 +2377,11 @@ +@@ -2522,15 +2502,11 @@ * undefined if this is the case. This function will choose a locale from the * ULocale.getAvailableLocales() list as available. * @@ -77,7 +67,7 @@ */ public static ULocale acceptLanguage(String acceptLanguageList, boolean[] fallback) { return acceptLanguage(acceptLanguageList, ULocale.getAvailableLocales(), -@@ -2424,13 +2399,10 @@ +@@ -2548,13 +2524,10 @@ * undefined if this is the case. This function will choose a locale from the * ULocale.getAvailableLocales() list as available. * |