commit dc927307ec69dcda57a05b51bcab78cb994f350b
author Alon Albert <aalbert@google.com> Thu Mar 01 16:05:55 2012 -0800
committer Alon Albert <aalbert@google.com> Fri Mar 02 09:43:17 2012 -0800
tree 0203d886aa89b5adf12aa11101aa982bad002d17
parent 3c90952036a5ff7ddb2946c643f1a0bf1c31d53a

Add a displayColor column to view_events

Change-Id: I0f73685ec75e56929553b01d6ede0ad11fba55f4

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d683da1..2357bd2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16002,6 +16002,7 @@
     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";

core/java/android/provider/CalendarContract.java

diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index fa59b32f..83799c4 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -856,6 +856,17 @@
         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>
          */