summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-08-15 20:56:53 -0700
committerLajos Molnar <lajos@google.com>2013-08-30 14:59:46 -0700
commitaf309824350d6b2fd38e19ef9104211e5ba132e8 (patch)
treef6b6fb3452b16caac78f55c712b1b3957dd22954 /api
parent91b87de7e1d9ddcef2dd1da0c7ad85a04ab2fe6f (diff)
downloadframeworks_base-af309824350d6b2fd38e19ef9104211e5ba132e8.zip
frameworks_base-af309824350d6b2fd38e19ef9104211e5ba132e8.tar.gz
frameworks_base-af309824350d6b2fd38e19ef9104211e5ba132e8.tar.bz2
VideoView: add addSubtitleSource
A way to add external subtitle file to VideoView. Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 27a8480..7149868 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12768,7 +12768,9 @@ package android.media {
field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd
field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322
field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321
+ field public static final int MEDIA_INFO_SUBTITLE_TIMED_OUT = 902; // 0x386
field public static final int MEDIA_INFO_UNKNOWN = 1; // 0x1
+ field public static final int MEDIA_INFO_UNSUPPORTED_SUBTITLE = 901; // 0x385
field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3
field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
@@ -32439,6 +32441,7 @@ package android.widget {
ctor public VideoView(android.content.Context);
ctor public VideoView(android.content.Context, android.util.AttributeSet);
ctor public VideoView(android.content.Context, android.util.AttributeSet, int);
+ method public void addSubtitleSource(java.io.InputStream, android.media.MediaFormat);
method public boolean canPause();
method public boolean canSeekBackward();
method public boolean canSeekForward();