Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ec6e5a authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge "ICU4J: Update API for using civil version of IslamicCalendar" into nyc-dev

parents 8673b289 74a8e08d

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18359,11 +18359,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

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19531,11 +19531,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

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18369,11 +18369,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