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

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

Merge "Add a displayColor column to view_events"

parents 8dc3cc2e dc927307

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -16003,6 +16003,7 @@ package android.provider { 
    field public static final java.lang.String CALENDAR_ID = "calendar_id";

    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 CAN_INVITE_OTHERS = "canInviteOthers";

    field public static final java.lang.String DESCRIPTION = "description";

    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 DTEND = "dtend";

    field public static final java.lang.String DTSTART = "dtstart";

    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 DURATION = "duration";

core/java/android/provider/CalendarContract.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -855,6 +855,17 @@ public final class CalendarContract { 
         */

         */

        public static final String EVENT_COLOR_KEY = "eventColor_index";

        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.

         * The event status. Column name.

         * <P>Type: INTEGER (one of {@link #STATUS_TENTATIVE}...)</P>

         * <P>Type: INTEGER (one of {@link #STATUS_TENTATIVE}...)</P>