diff options
author | kmccormick <kmccormick@google.com> | 2013-04-03 14:30:09 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-03 14:30:09 -0700 |
commit | bbcf0852f786ea1c9cf6dca85f45487b7739bfab (patch) | |
tree | 3e7e8cac6372f8c53b5f868066618bdee81927bf /core | |
parent | 6a5702041f48f868863a0454d7df6cd64eab235d (diff) | |
parent | 9d9365916def1a60d98cab7d59a4c98d9e7f6f42 (diff) | |
download | frameworks_base-bbcf0852f786ea1c9cf6dca85f45487b7739bfab.zip frameworks_base-bbcf0852f786ea1c9cf6dca85f45487b7739bfab.tar.gz frameworks_base-bbcf0852f786ea1c9cf6dca85f45487b7739bfab.tar.bz2 |
am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
Doc update: fix broken code sample
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/provider/CalendarContract.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 2dd27f8..25af209 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -106,16 +106,13 @@ public final class CalendarContract { * {@link Activity#RESULT_OK} or {@link Activity#RESULT_CANCELED} to * acknowledge whether the action was handled or not. * - * The custom app should have an intent-filter like the following + * The custom app should have an intent filter like the following: * <pre> - * {@code - * <intent-filter> - * <action android:name="android.provider.calendar.action.HANDLE_CUSTOM_EVENT" /> - * <category android:name="android.intent.category.DEFAULT" /> - * <data android:mimeType="vnd.android.cursor.item/event" /> - * </intent-filter> - * } - * </pre> + * <intent-filter> + * <action android:name="android.provider.calendar.action.HANDLE_CUSTOM_EVENT" /> + * <category android:name="android.intent.category.DEFAULT" /> + * <data android:mimeType="vnd.android.cursor.item/event" /> + * </intent-filter></pre> * <p> * Input: {@link Intent#getData} has the event URI. The extra * {@link #EXTRA_EVENT_BEGIN_TIME} has the start time of the instance. The @@ -123,7 +120,7 @@ public final class CalendarContract { * {@link EventsColumns#CUSTOM_APP_URI}. * <p> * Output: {@link Activity#RESULT_OK} if this was handled; otherwise - * {@link Activity#RESULT_CANCELED} + * {@link Activity#RESULT_CANCELED}. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_HANDLE_CUSTOM_EVENT = |