Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bbb11b80: Merge "Add a warning to changing colors in the docs" into ics-factoryrom

Browse Source 
* commit 'bbb11b80106c8687f2833c3d4b538029fc0805e6':
  Add a warning to changing colors in the docs
This commit is contained in:
RoboErik
2011-09-20 14:14:11 -07:00
committed by Android Git Automerger
parent 06b7deb8c0 bbb11b8010
commit 0f337df1c0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/CalendarContract.java
View File

@@ -292,7 +292,9 @@ public final class CalendarContract {
*/ */
protected interface CalendarColumns { protected interface CalendarColumns {
/** /**
* The color of the calendar * The color of the calendar. This should only be updated by the sync
* adapter, not other apps, as changing a calendar's color can adversely
* affect its display.
* <P>Type: INTEGER (color value)</P> * <P>Type: INTEGER (color value)</P>
*/ */
public static final String CALENDAR_COLOR = "calendar_color"; public static final String CALENDAR_COLOR = "calendar_color";
@@ -551,7 +553,6 @@ public final class CalendarContract {
* <ul> * <ul>
* <li>{@link #NAME}</li> * <li>{@link #NAME}</li>
* <li>{@link #CALENDAR_DISPLAY_NAME}</li> * <li>{@link #CALENDAR_DISPLAY_NAME}</li>
* <li>{@link #CALENDAR_COLOR}</li>
* <li>{@link #VISIBLE}</li> * <li>{@link #VISIBLE}</li>
* <li>{@link #SYNC_EVENTS}</li> * <li>{@link #SYNC_EVENTS}</li>
* </ul> * </ul>
@@ -559,6 +560,7 @@ public final class CalendarContract {
* <ul> * <ul>
* <li>{@link #ACCOUNT_NAME}</li> * <li>{@link #ACCOUNT_NAME}</li>
* <li>{@link #ACCOUNT_TYPE}</li> * <li>{@link #ACCOUNT_TYPE}</li>
* <li>{@link #CALENDAR_COLOR}</li>
* <li>{@link #_SYNC_ID}</li> * <li>{@link #_SYNC_ID}</li>
* <li>{@link #DIRTY}</li> * <li>{@link #DIRTY}</li>
* <li>{@link #OWNER_ACCOUNT}</li> * <li>{@link #OWNER_ACCOUNT}</li>
@@ -785,7 +787,8 @@ public final class CalendarContract {
public static final String EVENT_LOCATION = "eventLocation"; public static final String EVENT_LOCATION = "eventLocation";
/** /**
* A secondary color for the individual event. Column name. * A secondary color for the individual event. Reserved for future use.
* Column name.
* <P>Type: INTEGER</P> * <P>Type: INTEGER</P>
*/ */
public static final String EVENT_COLOR = "eventColor"; public static final String EVENT_COLOR = "eventColor";