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

Commit 7267baba authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Enabled application using VideoView to get information events from... 

Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev
parents e72a6e97 a0ba7947

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/widget/VideoView.java

+13 −0
Original line number Diff line number Diff line
@@ -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,