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

Commit 0ff65375 authored by Alon Albert's avatar Alon Albert Committed by Android (Google) Code Review
Browse files

Merge "Add columns to CalendarContract" into jb-mr1-dev

parents 888eb73c 0a9a219c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -17179,6 +17179,7 @@ package android.provider { 
    field public static final int CAL_ACCESS_ROOT = 800; // 0x320

    field public static final java.lang.String CAN_MODIFY_TIME_ZONE = "canModifyTimeZone";

    field public static final java.lang.String CAN_ORGANIZER_RESPOND = "canOrganizerRespond";

    field public static final java.lang.String IS_PRIMARY = "isPrimary";

    field public static final java.lang.String MAX_REMINDERS = "maxReminders";

    field public static final java.lang.String OWNER_ACCOUNT = "ownerAccount";

    field public static final java.lang.String SYNC_EVENTS = "sync_events";
@@ -17270,6 +17271,7 @@ package android.provider { 
    field public static final java.lang.String HAS_ALARM = "hasAlarm";

    field public static final java.lang.String HAS_ATTENDEE_DATA = "hasAttendeeData";

    field public static final java.lang.String HAS_EXTENDED_PROPERTIES = "hasExtendedProperties";

    field public static final java.lang.String IS_ORGANIZER = "isOrganizer";

    field public static final java.lang.String LAST_DATE = "lastDate";

    field public static final java.lang.String LAST_SYNCED = "lastSynced";

    field public static final java.lang.String ORGANIZER = "organizer";

core/java/android/provider/CalendarContract.java

+16 −0
Original line number Diff line number Diff line
@@ -467,6 +467,13 @@ public final class CalendarContract { 
         *

         */

        public static final String ALLOWED_ATTENDEE_TYPES = "allowedAttendeeTypes";



        /**

         * Is this the primary calendar for this account. If this column is not explicitly set, the

         * provider will return 1 if {@link Calendars#ACCOUNT_NAME} is equal to

         * {@link Calendars#OWNER_ACCOUNT}.

         */

        public static final String IS_PRIMARY = "isPrimary";

    }



    /**
@@ -1205,6 +1212,14 @@ public final class CalendarContract { 
         */

        public static final String ORGANIZER = "organizer";



        /**

         * Are we the organizer of this event. If this column is not explicitly set, the provider

         * will return 1 if {@link #ORGANIZER} is equal to {@link Calendars#OWNER_ACCOUNT}.

         * Column name.

         * <P>Type: STRING</P>

         */

        public static final String IS_ORGANIZER = "isOrganizer";



        /**

         * Whether the user can invite others to the event. The

         * GUESTS_CAN_INVITE_OTHERS is a setting that applies to an arbitrary
@@ -1368,6 +1383,7 @@ public final class CalendarContract { 
                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_PACKAGE);

                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_URI);

                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, ORGANIZER);

                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER);

                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID);

                DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY);

                DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, LAST_SYNCED);