diff options
author | RoboErik <epastern@google.com> | 2011-10-25 13:59:13 -0700 |
---|---|---|
committer | RoboErik <epastern@google.com> | 2011-10-27 10:50:09 -0700 |
commit | 4172d95a6726efd5f03517e1a2a6fbbe879f1d74 (patch) | |
tree | 48c5d9e2a8a8499393805b5746ee7aa63dfe930f /api | |
parent | 1bfe6e95a175b45ee68921e3ffe2571b222864bf (diff) | |
download | frameworks_base-4172d95a6726efd5f03517e1a2a6fbbe879f1d74.zip frameworks_base-4172d95a6726efd5f03517e1a2a6fbbe879f1d74.tar.gz frameworks_base-4172d95a6726efd5f03517e1a2a6fbbe879f1d74.tar.bz2 |
Add new Calendar APIs to fw
b/5317399 b/5309787 b/5207781 b/5347210 Adds apis for a color
table to support future migrations. Adds allowedAttendeeTypes
and allowedAvailabilities for exchange/gsync support. Adds
type_resource for attendees and tentative availability. Documents
that eventTimezone is required for creating an event.
Change-Id: Id3f866c46f76f2b5b098f4961ea09d48f17598c3
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b30f7a6..5f4081d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15728,6 +15728,7 @@ package android.provider { field public static final int TYPE_NONE = 0; // 0x0 field public static final int TYPE_OPTIONAL = 2; // 0x2 field public static final int TYPE_REQUIRED = 1; // 0x1 + field public static final int TYPE_RESOURCE = 3; // 0x3 } public static final class CalendarContract.CalendarAlerts implements android.provider.BaseColumns android.provider.CalendarContract.CalendarAlertsColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.EventsColumns { @@ -15766,9 +15767,12 @@ package android.provider { } protected static abstract interface CalendarContract.CalendarColumns { + field public static final java.lang.String ALLOWED_ATTENDEE_TYPES = "allowedAttendeeTypes"; + field public static final java.lang.String ALLOWED_AVAILABILITY = "allowedAvailability"; field public static final java.lang.String ALLOWED_REMINDERS = "allowedReminders"; field public static final java.lang.String CALENDAR_ACCESS_LEVEL = "calendar_access_level"; field public static final java.lang.String CALENDAR_COLOR = "calendar_color"; + field public static final java.lang.String CALENDAR_COLOR_KEY = "calendar_color_index"; field public static final java.lang.String CALENDAR_DISPLAY_NAME = "calendar_displayName"; field public static final java.lang.String CALENDAR_TIME_ZONE = "calendar_timezone"; field public static final int CAL_ACCESS_CONTRIBUTOR = 500; // 0x1f4 @@ -15813,6 +15817,18 @@ package android.provider { field public static final java.lang.String NAME = "name"; } + public static final class CalendarContract.Colors implements android.provider.CalendarContract.ColorsColumns { + field public static final android.net.Uri CONTENT_URI; + } + + protected static abstract interface CalendarContract.ColorsColumns implements android.provider.SyncStateContract.Columns { + field public static final java.lang.String COLOR = "color"; + field public static final java.lang.String COLOR_KEY = "color_index"; + field public static final java.lang.String COLOR_TYPE = "color_type"; + field public static final int TYPE_CALENDAR = 0; // 0x0 + field public static final int TYPE_EVENT = 1; // 0x1 + } + public static final class CalendarContract.EventDays implements android.provider.CalendarContract.EventDaysColumns { method public static final android.database.Cursor query(android.content.ContentResolver, int, int, java.lang.String[]); field public static final android.net.Uri CONTENT_URI; @@ -15838,6 +15854,7 @@ package android.provider { field public static final java.lang.String AVAILABILITY = "availability"; field public static final int AVAILABILITY_BUSY = 0; // 0x0 field public static final int AVAILABILITY_FREE = 1; // 0x1 + field public static final int AVAILABILITY_TENTATIVE = 2; // 0x2 field public static final java.lang.String CALENDAR_ID = "calendar_id"; field public static final java.lang.String CAN_INVITE_OTHERS = "canInviteOthers"; field public static final java.lang.String DESCRIPTION = "description"; @@ -15845,6 +15862,7 @@ package android.provider { field public static final java.lang.String DTSTART = "dtstart"; field public static final java.lang.String DURATION = "duration"; field public static final java.lang.String EVENT_COLOR = "eventColor"; + field public static final java.lang.String EVENT_COLOR_KEY = "eventColor_index"; field public static final java.lang.String EVENT_END_TIMEZONE = "eventEndTimezone"; field public static final java.lang.String EVENT_LOCATION = "eventLocation"; field public static final java.lang.String EVENT_TIMEZONE = "eventTimezone"; |