Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bjorn Bringert
2012-09-21 10:30:19 -07:00
committed by Android (Google) Code Review
parent 466bd63681 b1ac72b54b
commit 45b07b9427
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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>";

32
core/java/android/provider/MediaStore.java
View File

@@ -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
*/