Merge "Keep the controller when video ended." into jb-dev (9ac32040) · Commits · e / os / android_frameworks_base

core/java/android/webkit/HTML5VideoFullScreen.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
		// after reading the MetaData
		if (mMediaController != null) {
		mMediaController.setEnabled(true);
		mMediaController.show();
		}

		if (mProgressView != null) {
		@@ -320,6 +321,11 @@ public class HTML5VideoFullScreen extends HTML5VideoView
		return 0;
		}

		@Override
		public void showControllerInFullScreen() {
		mMediaController.show(0);
		}

		// Other listeners functions:
		private MediaPlayer.OnBufferingUpdateListener mBufferingUpdateListener =
		new MediaPlayer.OnBufferingUpdateListener() {

+3 −0

Original line number	Diff line number	Diff line
		@@ -357,4 +357,7 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener {
		return mStartWhenPrepared;
		}

		public void showControllerInFullScreen() {
		}

		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,7 @@ class HTML5VideoViewProxy extends Handler
		}

		public static void end() {
		mHTML5VideoView.showControllerInFullScreen();
		if (mCurrentProxy != null) {
		if (isVideoSelfEnded)
		mCurrentProxy.dispatchOnEnded();