diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/CalendarContract.java | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d683da1f1500..2357bd2fe472 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16002,6 +16002,7 @@ package android.provider { 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"; + field public static final java.lang.String DISPLAY_COLOR = "displayColor"; field public static final java.lang.String DTEND = "dtend"; field public static final java.lang.String DTSTART = "dtstart"; field public static final java.lang.String DURATION = "duration"; diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index fa59b32fddfc..83799c4440c9 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -856,6 +856,17 @@ public final class CalendarContract { public static final String EVENT_COLOR_KEY = "eventColor_index"; /** + * This will be {@link #EVENT_COLOR} if it is not null; otherwise, this will be + * {@link Calendars#CALENDAR_COLOR}. + * Read-only value. To modify, write to {@link #EVENT_COLOR} or + * {@link Calendars#CALENDAR_COLOR} directly. + *<P> + * Type: INTEGER + *</P> + */ + public static final String DISPLAY_COLOR = "displayColor"; + + /** * The event status. Column name. * <P>Type: INTEGER (one of {@link #STATUS_TENTATIVE}...)</P> */ |