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

Commit f9173428 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android Git Automerger
Browse files

am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev 

* commit '45b07b94':
  Add intents to open text and video from search.
parents 7c987ca4 45b07b94

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -18432,7 +18432,9 @@ package android.provider { 
    field public static final deprecated java.lang.String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";

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

    field public static final java.lang.String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE";

    field public static final java.lang.String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH = "android.media.action.TEXT_OPEN_FROM_SEARCH";

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

    field public static final java.lang.String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH = "android.media.action.VIDEO_PLAY_FROM_SEARCH";

    field public static final java.lang.String MEDIA_IGNORE_FILENAME = ".nomedia";

    field public static final java.lang.String MEDIA_SCANNER_VOLUME = "volume";

    field public static final java.lang.String UNKNOWN_STRING = "<unknown>";

core/java/android/provider/MediaStore.java

+32 −0
Original line number Diff line number Diff line
@@ -121,6 +121,38 @@ public final class MediaStore { 
    public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH =

            "android.media.action.MEDIA_PLAY_FROM_SEARCH";



    /**

     * An intent to perform a search for readable media and automatically play content from the

     * result when possible. This can be fired, for example, by the result of a voice recognition

     * command to read a book or magazine.

     * <p>

     * Contains the {@link android.app.SearchManager#QUERY} extra, which is a string that can

     * contain any type of unstructured text search, like the name of a book or magazine, an author

     * a genre, a publisher, or any combination of these.

     * <p>

     * Because this intent includes an open-ended unstructured search string, it makes the most

     * 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.

     */

    public static final String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH =

            "android.media.action.TEXT_OPEN_FROM_SEARCH";



    /**

     * An intent to perform a search for video media and automatically play content from the

     * result when possible. This can be fired, for example, by the result of a voice recognition

     * command to play movies.

     * <p>

     * Contains the {@link android.app.SearchManager#QUERY} extra, which is a string that can

     * contain any type of unstructured video search, like the name of a movie, one or more actors,

     * a genre, or any combination of these.

     * <p>

     * Because this intent includes an open-ended unstructured search string, it makes the most

     * 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.

     */

    public static final String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH =

            "android.media.action.VIDEO_PLAY_FROM_SEARCH";



    /**

     * The name of the Intent-extra used to define the artist

     */