diff options
| author | Bjorn Bringert <bringert@android.com> | 2012-09-21 10:30:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 10:30:20 -0700 |
| commit | 45b07b9427cc736bf4fd5658ef2f30884ba4d9a4 (patch) | |
| tree | 0d289611ef41cb3ad10aba80742830a5ad59f69f /api/current.txt | |
| parent | 466bd636812684aeb8161f144597cc3b3ed39078 (diff) | |
| parent | b1ac72b54b72cb6bb26f6d2b92335189d8669eb0 (diff) | |
| download | frameworks_base-45b07b9427cc736bf4fd5658ef2f30884ba4d9a4.zip frameworks_base-45b07b9427cc736bf4fd5658ef2f30884ba4d9a4.tar.gz frameworks_base-45b07b9427cc736bf4fd5658ef2f30884ba4d9a4.tar.bz2 | |
Merge "Add intents to open text and video from search." into jb-mr1-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 30028ae..698fb65 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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>"; |