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

Commit 46b84d5b authored by Mike LeBeau's avatar Mike LeBeau Committed by Android (Google) Code Review
Browse files

Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended... 

Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread
parents 95d86480 2fe6fd05

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -140773,6 +140773,17 @@ 
 visibility="public"

>

</field>

<field name="INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.media.action.MEDIA_PLAY_FROM_SEARCH&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INTENT_ACTION_MEDIA_SEARCH"

 type="java.lang.String"

 transient="false"

core/java/android/provider/MediaStore.java

+16 −0
Original line number Diff line number Diff line
@@ -74,6 +74,22 @@ public final class MediaStore { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String INTENT_ACTION_MEDIA_SEARCH = "android.intent.action.MEDIA_SEARCH";



    /**

     * An intent to perform a search for music 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 listen to music.

     * <p>

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

     * that can contain any type of unstructured music search, like the name of an artist,

     * an album, a song, 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 music, such as services connected

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

     */

    public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH =

            "android.media.action.MEDIA_PLAY_FROM_SEARCH";

    

    /**

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

     */