diff options
| author | James Dong <jdong@google.com> | 2012-07-30 13:37:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-30 13:37:08 -0700 |
| commit | 7267babae3695408daa96da1f5951c8f22e823a7 (patch) | |
| tree | 5bc194bb63bf67a780059a202caeac5818c5d622 | |
| parent | e72a6e977b8436a993c427cf489f2ae05fdeface (diff) | |
| parent | a0ba79473b9067e315155718545103bb4f361873 (diff) | |
| download | frameworks_base-7267babae3695408daa96da1f5951c8f22e823a7.zip frameworks_base-7267babae3695408daa96da1f5951c8f22e823a7.tar.gz frameworks_base-7267babae3695408daa96da1f5951c8f22e823a7.tar.bz2 | |
Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/widget/VideoView.java | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 86e47d6..d37b2922 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29254,6 +29254,7 @@ package android.widget { method public void setMediaController(android.widget.MediaController); method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener); method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener); + method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener); method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener); method public void setVideoPath(java.lang.String); method public void setVideoURI(android.net.Uri); diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index 0fba498..ff1dd11 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -26,6 +26,7 @@ import android.media.MediaPlayer; import android.media.Metadata; import android.media.MediaPlayer.OnCompletionListener; import android.media.MediaPlayer.OnErrorListener; +import android.media.MediaPlayer.OnInfoListener; import android.net.Uri; import android.util.AttributeSet; import android.util.Log; @@ -84,6 +85,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { private MediaPlayer.OnPreparedListener mOnPreparedListener; private int mCurrentBufferPercentage; private OnErrorListener mOnErrorListener; + private OnInfoListener mOnInfoListener; private int mSeekWhenPrepared; // recording the seek position while preparing private boolean mCanPause; private boolean mCanSeekBack; @@ -230,6 +232,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { mDuration = -1; mMediaPlayer.setOnCompletionListener(mCompletionListener); mMediaPlayer.setOnErrorListener(mErrorListener); + mMediaPlayer.setOnInfoListener(mOnInfoListener); mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener); mCurrentBufferPercentage = 0; mMediaPlayer.setDataSource(mContext, mUri, mHeaders); @@ -455,6 +458,16 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { mOnErrorListener = l; } + /** + * Register a callback to be invoked when an informational event + * occurs during playback or setup. + * + * @param l The callback that will be run + */ + public void setOnInfoListener(OnInfoListener l) { + mOnInfoListener = l; + } + SurfaceHolder.Callback mSHCallback = new SurfaceHolder.Callback() { public void surfaceChanged(SurfaceHolder holder, int format, |