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

Merge "Update to hidden APIs"

Browse Source
This commit is contained in:
RoboErik
2011-10-18 10:47:50 -07:00
committed by Android (Google) Code Review
parent 29a15a237a 05b36e5f3c
commit 39617b0036
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -745,7 +745,7 @@ public final class CalendarContract {
/** /**
* This specifies that an attendee is a resource, such as a room, and * This specifies that an attendee is a resource, such as a room, and
* not an actual person. TODO UNHIDE and add to ATTENDEE_TYPE comment * not an actual person. TODO UNHIDE and add to ATTENDEE_TYPE comment
* *
* @hide * @hide
*/ */
public static final int TYPE_RESOURCE = 3; public static final int TYPE_RESOURCE = 3;
@@ -2335,26 +2335,16 @@ public final class CalendarContract {
public static final String COLOR_INDEX = "color_index"; public static final String COLOR_INDEX = "color_index";
/** /**
* The version of this color that will work with dark text as an 8-bit * The color as an 8-bit ARGB integer value. Colors should specify alpha
* ARGB integer value. Colors should specify alpha as fully opaque (eg * as fully opaque (eg 0xFF993322) as the alpha may be ignored or
* 0xFF993322) as the alpha may be ignored or modified for display. * modified for display. It is reccomended that colors be usable with
* Column name. * light (near white) text. Apps should not depend on that assumption,
* however. Column name.
* <P> * <P>
* Type: INTEGER (NOT NULL) * Type: INTEGER (NOT NULL)
* </P> * </P>
*/ */
public static final String COLOR_LIGHT = "color_light"; public static final String COLOR = "color";
/**
* The version of this color that will work with light text as an 8-bit
* ARGB integer value. Colors should specify alpha as fully opaque (eg
* 0xFF993322) as the alpha may be ignored or modified for display.
* Column name.
* <P>
* Type: INTEGER (NOT NULL)
* </P>
*/
public static final String COLOR_DARK = "color_dark";
} }