From 679fa0261ce91aa6520dcac6a8d538baba94bf9e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 22 Mar 2016 13:46:38 +0000 Subject: [PATCH 1/3] ICU4J: Update API for using civil version of IslamicCalendar Bug: 22023363 (cherry picked from commit 74a8e08d59169865ecb5e0ae9ba6a57f0814a05a) Change-Id: I0d7b756be123f806d035ee225960f27806785424 --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 57e3c9b08d85d..bcca2e4a05020 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17806,11 +17806,11 @@ package android.icu.util { ctor public IslamicCalendar(java.util.Date); ctor public IslamicCalendar(int, int, int); ctor public IslamicCalendar(int, int, int, int, int, int); + method public android.icu.util.IslamicCalendar.CalculationType getCalculationType(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetExtendedYear(); method protected int handleGetLimit(int, int); - method public boolean isCivil(); - method public void setCivil(boolean); + method public void setCalculationType(android.icu.util.IslamicCalendar.CalculationType); field public static final int DHU_AL_HIJJAH = 11; // 0xb field public static final int DHU_AL_QIDAH = 10; // 0xa field public static final int JUMADA_1 = 4; // 0x4 diff --git a/api/system-current.txt b/api/system-current.txt index f5c69786de909..b4b923feceab2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18755,11 +18755,11 @@ package android.icu.util { ctor public IslamicCalendar(java.util.Date); ctor public IslamicCalendar(int, int, int); ctor public IslamicCalendar(int, int, int, int, int, int); + method public android.icu.util.IslamicCalendar.CalculationType getCalculationType(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetExtendedYear(); method protected int handleGetLimit(int, int); - method public boolean isCivil(); - method public void setCivil(boolean); + method public void setCalculationType(android.icu.util.IslamicCalendar.CalculationType); field public static final int DHU_AL_HIJJAH = 11; // 0xb field public static final int DHU_AL_QIDAH = 10; // 0xa field public static final int JUMADA_1 = 4; // 0x4 From 6d1f0b2afd4b1c59f926bd9761afc749ed3ac309 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Sat, 19 Mar 2016 16:32:45 +0000 Subject: [PATCH 2/3] ICU4J: Removed a couple of useless or internal methods from API Bug: 22023363 (cherry picked from commit c108dea0bb0558f6d8462374775891005469097d) Change-Id: I07c42b1124490daf502d1b3aff37b249d6118552 --- api/current.txt | 5 ----- api/system-current.txt | 5 ----- 2 files changed, 10 deletions(-) diff --git a/api/current.txt b/api/current.txt index bcca2e4a05020..b90074131cac8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17403,11 +17403,8 @@ package android.icu.util { ctor protected CECalendar(int, int, int); ctor protected CECalendar(java.util.Date); ctor protected CECalendar(int, int, int, int, int, int); - method public static int ceToJD(long, int, int, int); - method protected abstract int getJDEpochOffset(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetLimit(int, int); - method public static void jdToCE(int, int, int[]); } public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable { @@ -17635,7 +17632,6 @@ package android.icu.util { ctor public CopticCalendar(int, int, int); ctor public CopticCalendar(java.util.Date); ctor public CopticCalendar(int, int, int, int, int, int); - method protected deprecated int getJDEpochOffset(); method protected deprecated int handleGetExtendedYear(); field public static final int AMSHIR = 5; // 0x5 field public static final int BABA = 1; // 0x1 @@ -18248,7 +18244,6 @@ package android.icu.util { method public int getMicro(); method public int getMilli(); method public int getMinor(); - method public static void main(java.lang.String[]); field public static final android.icu.util.VersionInfo ICU_VERSION; field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION; field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION; diff --git a/api/system-current.txt b/api/system-current.txt index b4b923feceab2..c25c32c808388 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18352,11 +18352,8 @@ package android.icu.util { ctor protected CECalendar(int, int, int); ctor protected CECalendar(java.util.Date); ctor protected CECalendar(int, int, int, int, int, int); - method public static int ceToJD(long, int, int, int); - method protected abstract int getJDEpochOffset(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetLimit(int, int); - method public static void jdToCE(int, int, int[]); } public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable { @@ -18584,7 +18581,6 @@ package android.icu.util { ctor public CopticCalendar(int, int, int); ctor public CopticCalendar(java.util.Date); ctor public CopticCalendar(int, int, int, int, int, int); - method protected deprecated int getJDEpochOffset(); method protected deprecated int handleGetExtendedYear(); field public static final int AMSHIR = 5; // 0x5 field public static final int BABA = 1; // 0x1 @@ -19197,7 +19193,6 @@ package android.icu.util { method public int getMicro(); method public int getMilli(); method public int getMinor(); - method public static void main(java.lang.String[]); field public static final android.icu.util.VersionInfo ICU_VERSION; field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION; field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION; From 29e835a5152905274e06c59a69e39e81e5078519 Mon Sep 17 00:00:00 2001 From: Joachim Sauer Date: Tue, 22 Mar 2016 13:32:35 +0000 Subject: [PATCH 3/3] Hide general utility methods in ICU4J. Bug: 22023363 (cherry picked from commit d76fe896d444ee7bf625493e12c51ee28bcc82ef) Change-Id: Ic923c558270b81fe48034c46bfcd9b1ac1d438f2 --- api/current.txt | 9 --------- api/system-current.txt | 9 --------- 2 files changed, 18 deletions(-) diff --git a/api/current.txt b/api/current.txt index b90074131cac8..761e5d3885809 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17207,9 +17207,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet addAll(java.lang.Iterable); method public android.icu.text.UnicodeSet addAll(T...); method public T addAllTo(T); - method public java.lang.String[] addAllTo(java.lang.String[]); - method public static U addAllTo(java.lang.Iterable, U); - method public static T[] addAllTo(java.lang.Iterable, T[]); method public void addMatchSetTo(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int); method public final android.icu.text.UnicodeSet applyPattern(java.lang.String); @@ -17223,10 +17220,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet cloneAsThawed(); method public android.icu.text.UnicodeSet closeOver(int); method public android.icu.text.UnicodeSet compact(); - method public static int compare(java.lang.CharSequence, int); - method public static int compare(int, java.lang.CharSequence); - method public static int compare(java.lang.Iterable, java.lang.Iterable); - method public static int compare(java.util.Collection, java.util.Collection, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(android.icu.text.UnicodeSet); method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(java.lang.Iterable); @@ -17269,7 +17262,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable); method public final android.icu.text.UnicodeSet removeAllStrings(); - method public static boolean resemblesPattern(java.lang.String, int); method public android.icu.text.UnicodeSet retain(int, int); method public final android.icu.text.UnicodeSet retain(int); method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence); @@ -17284,7 +17276,6 @@ package android.icu.text { method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition); method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition); method public java.util.Collection strings(); - method public static java.lang.String[] toArray(android.icu.text.UnicodeSet); method public java.lang.String toPattern(boolean); field public static final int ADD_CASE_MAPPINGS = 4; // 0x4 field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS; diff --git a/api/system-current.txt b/api/system-current.txt index c25c32c808388..dc7ffa0bc778a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18156,9 +18156,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet addAll(java.lang.Iterable); method public android.icu.text.UnicodeSet addAll(T...); method public T addAllTo(T); - method public java.lang.String[] addAllTo(java.lang.String[]); - method public static U addAllTo(java.lang.Iterable, U); - method public static T[] addAllTo(java.lang.Iterable, T[]); method public void addMatchSetTo(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int); method public final android.icu.text.UnicodeSet applyPattern(java.lang.String); @@ -18172,10 +18169,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet cloneAsThawed(); method public android.icu.text.UnicodeSet closeOver(int); method public android.icu.text.UnicodeSet compact(); - method public static int compare(java.lang.CharSequence, int); - method public static int compare(int, java.lang.CharSequence); - method public static int compare(java.lang.Iterable, java.lang.Iterable); - method public static int compare(java.util.Collection, java.util.Collection, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(android.icu.text.UnicodeSet); method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(java.lang.Iterable); @@ -18218,7 +18211,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable); method public final android.icu.text.UnicodeSet removeAllStrings(); - method public static boolean resemblesPattern(java.lang.String, int); method public android.icu.text.UnicodeSet retain(int, int); method public final android.icu.text.UnicodeSet retain(int); method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence); @@ -18233,7 +18225,6 @@ package android.icu.text { method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition); method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition); method public java.util.Collection strings(); - method public static java.lang.String[] toArray(android.icu.text.UnicodeSet); method public java.lang.String toPattern(boolean); field public static final int ADD_CASE_MAPPINGS = 4; // 0x4 field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS;