summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-10-27 18:06:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-27 18:06:15 +0000
commit7c210d2dad36f19abefe4e1e8224579c66a737c4 (patch)
tree4c97ccff3cd3654fa4beeb8a2bd5de6404f7b106 /docs
parentc04e2d5f1678b3251edbcc1297015b49b36086a7 (diff)
parentcbce4eda4fae6b18efde9aa161a665e92a36c969 (diff)
downloadframeworks_base-7c210d2dad36f19abefe4e1e8224579c66a737c4.zip
frameworks_base-7c210d2dad36f19abefe4e1e8224579c66a737c4.tar.gz
frameworks_base-7c210d2dad36f19abefe4e1e8224579c66a737c4.tar.bz2
am cbce4eda: Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
* commit 'cbce4eda4fae6b18efde9aa161a665e92a36c969': docs: change calendar overview to recommend using data URI instead of MIME type for event intents
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/android-4.0.jd9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd
index 0708dd3..cad89c2 100644
--- a/docs/html/sdk/android-4.0.jd
+++ b/docs/html/sdk/android-4.0.jd
@@ -264,10 +264,11 @@ the {@link android.Manifest.permission#READ_CALENDAR} permission (for read acces
<h4>Event intent</h4>
-<p>If all you want to do is add an event to the user’s calendar, you can use an
-{@link android.content.Intent#ACTION_INSERT} intent with a {@code "vnd.android.cursor.item/event"}
-MIME type to start an activity in the Calendar app that creates new events. Using the intent does
-not require any permission and you can specify event details with the following extras:</p>
+<p>If all you want to do is add an event to the user’s calendar, you can use an {@link
+android.content.Intent#ACTION_INSERT} intent with the data defined by {@link
+android.provider.CalendarContract.Events#CONTENT_URI Events.CONTENT_URI} in order to start an
+activity in the Calendar app that creates new events. Using the intent does not require any
+permission and you can specify event details with the following extras:</p>
<ul>
<li>{@link android.provider.CalendarContract.EventsColumns#TITLE Events.TITLE}: Name for the