am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs

* commit '3fb5536d625a070be712aa817705b93b262e3f8c':
  Doc update: fix broken code sample
This commit is contained in:
kmccormick
2013-04-03 14:21:10 -07:00
committed by Android Git Automerger

View File

@@ -106,16 +106,13 @@ public final class CalendarContract {
* {@link Activity#RESULT_OK} or {@link Activity#RESULT_CANCELED} to * {@link Activity#RESULT_OK} or {@link Activity#RESULT_CANCELED} to
* acknowledge whether the action was handled or not. * 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> * <pre>
* {@code * &lt;intent-filter&gt;
* <intent-filter> * &lt;action android:name="android.provider.calendar.action.HANDLE_CUSTOM_EVENT" /&gt;
* <action android:name="android.provider.calendar.action.HANDLE_CUSTOM_EVENT" /> * &lt;category android:name="android.intent.category.DEFAULT" /&gt;
* <category android:name="android.intent.category.DEFAULT" /> * &lt;data android:mimeType="vnd.android.cursor.item/event" /&gt;
* <data android:mimeType="vnd.android.cursor.item/event" /> * &lt;/intent-filter&gt;</pre>
* </intent-filter>
* }
* </pre>
* <p> * <p>
* Input: {@link Intent#getData} has the event URI. The extra * Input: {@link Intent#getData} has the event URI. The extra
* {@link #EXTRA_EVENT_BEGIN_TIME} has the start time of the instance. The * {@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}. * {@link EventsColumns#CUSTOM_APP_URI}.
* <p> * <p>
* Output: {@link Activity#RESULT_OK} if this was handled; otherwise * Output: {@link Activity#RESULT_OK} if this was handled; otherwise
* {@link Activity#RESULT_CANCELED} * {@link Activity#RESULT_CANCELED}.
*/ */
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_HANDLE_CUSTOM_EVENT = public static final String ACTION_HANDLE_CUSTOM_EVENT =