Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11e9274f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am c7ce6985: am 50a8663d: am 437befc1: Merge "Docs change: annotate media... 

am c7ce6985: am 50a8663d: am 437befc1: Merge "Docs change: annotate media intent actions." into klp-dev

* commit 'c7ce6985':
  Docs change: annotate media intent actions.
parents df1487db c7ce6985

core/java/android/app/DownloadManager.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.app;



import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.content.ContentResolver;

import android.content.ContentUris;

import android.content.ContentValues;
@@ -267,18 +269,21 @@ public class DownloadManager { 
    /**

     * Broadcast intent action sent by the download manager when a download completes.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public final static String ACTION_DOWNLOAD_COMPLETE = "android.intent.action.DOWNLOAD_COMPLETE";



    /**

     * Broadcast intent action sent by the download manager when the user clicks on a running

     * download, either from a system notification or from the downloads UI.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public final static String ACTION_NOTIFICATION_CLICKED =

            "android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED";



    /**

     * Intent action to launch an activity to display all downloads.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public final static String ACTION_VIEW_DOWNLOADS = "android.intent.action.VIEW_DOWNLOADS";



    /**

core/java/android/provider/MediaStore.java

+9 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ public final class MediaStore { 
     * sense for apps that can support large-scale search of music, such as services connected

     * to an online database of music which can be streamed and played on the device.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH =

            "android.media.action.MEDIA_PLAY_FROM_SEARCH";
@@ -134,6 +135,7 @@ public final class MediaStore { 
     * sense for apps that can support large-scale search of text media, such as services connected

     * to an online database of books and/or magazines which can be read on the device.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH =

            "android.media.action.TEXT_OPEN_FROM_SEARCH";
@@ -150,6 +152,7 @@ public final class MediaStore { 
     * sense for apps that can support large-scale search of video, such as services connected to an

     * online database of videos which can be streamed and played on the device.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH =

            "android.media.action.VIDEO_PLAY_FROM_SEARCH";
@@ -202,6 +205,7 @@ public final class MediaStore { 
    /**

     * The name of the Intent action used to launch a camera in still image mode.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA";



    /**
@@ -216,12 +220,14 @@ public final class MediaStore { 
     * this flag is used, so launching more than one activity is strongly

     * discouraged.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE =

            "android.media.action.STILL_IMAGE_CAMERA_SECURE";



    /**

     * The name of the Intent action used to launch a camera in video mode.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_VIDEO_CAMERA = "android.media.action.VIDEO_CAMERA";



    /**
@@ -235,6 +241,7 @@ public final class MediaStore { 
     * value of EXTRA_OUTPUT.

     * @see #EXTRA_OUTPUT

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public final static String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";



    /**
@@ -256,6 +263,7 @@ public final class MediaStore { 
     * @see #ACTION_IMAGE_CAPTURE

     * @see #EXTRA_OUTPUT

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_IMAGE_CAPTURE_SECURE =

            "android.media.action.IMAGE_CAPTURE_SECURE";
@@ -274,6 +282,7 @@ public final class MediaStore { 
     * @see #EXTRA_SIZE_LIMIT

     * @see #EXTRA_DURATION_LIMIT

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public final static String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";



    /**