Merge remote-tracking branch 'origin/release-6.7.8' into release-7.1.1

livecodesebastien · livecodesebastien · commit 6761fcaa27f8 · 2015-10-20T12:21:37.000+01:00
Clean merge
diff --git a/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java b/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java
@@ -328,6 +328,10 @@ private void attachMediaController() {
                     (View)this.getParent() : this;
             mMediaController.setAnchorView(anchorView);
             mMediaController.setEnabled(isInPlaybackState());
+			
+			// PM-2015-10-19: [[ Bug 16027 ]] Make sure the controller shows/hides when changing its visibility on demand
+			if (isInPlaybackState())
+				mMediaController.show(0);
         }
     }
 
@@ -369,7 +373,13 @@ public void onPrepared(MediaPlayer mp) {
             }
             if (mMediaController != null) {
                 mMediaController.setEnabled(true);
+
+				// PM-2015-10-19: [[ Bug 16027 ]] Show the controller once the player is prepared (as on iOS)
+				if (isInPlaybackState()){
+					mMediaController.show(0);
+				}
             }
+
             mVideoWidth = mp.getVideoWidth();
             mVideoHeight = mp.getVideoHeight();
 
@@ -390,10 +400,6 @@ public void onPrepared(MediaPlayer mp) {
                     // start the video here instead of in the callback.
                     if (mTargetState == STATE_PLAYING) {
                         start();
-                        if (mMediaController != null) {
-							// PM-2015-10-08: [[ Bug 16027 ]] Make sure the controller does not disappear after some ms of inactivity
-                            mMediaController.show(0);
-                        }
                     } else if (!isPlaying() &&
                                (seekToPosition != 0 || getCurrentPosition() > 0)) {
                        if (mMediaController != null) {
@@ -407,10 +413,6 @@ public void onPrepared(MediaPlayer mp) {
                 // The video size might be reported to us later.
                 if (mTargetState == STATE_PLAYING) {
                     start();
-					// show the controller when starting playing a remote video
-					if (mMediaController != null) {
-						mMediaController.show(0);
-					}
                 }
             }
         }
@@ -542,10 +544,7 @@ public void surfaceChanged(SurfaceHolder holder, int format,
                     seekTo(mSeekWhenPrepared);
                 }
                 start();
-                if (mMediaController != null) {
-                    mMediaController.show(0);
-                }
-            }
+			}
         }
 
         public void surfaceCreated(SurfaceHolder holder)
@@ -626,7 +625,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
                     keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
                 if (mMediaPlayer.isPlaying()) {
                     pause();
-                    mMediaController.show(0);
+					mMediaController.show(0);
                 } else {
                     start();
                     mMediaController.hide();
@@ -635,7 +634,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
             } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
                     && mMediaPlayer.isPlaying()) {
                 pause();
-                mMediaController.show(0);
+				mMediaController.show(0);
             } else {
                 toggleMediaControlsVisiblity();
             }
@@ -659,6 +658,12 @@ public void start() {
             mCurrentState = STATE_PLAYING;
         }
         mTargetState = STATE_PLAYING;
+
+		// PM-2015-10-19: [[ Bug 16027 ]] Show the controller here, to make sure it is enabled even if
+		// mobileControlDo sPlayerId, "play" is called from a callback message
+		if (mMediaController != null) {
+			mMediaController.show(0);
+		}
     }
 
     public void stop() {
diff --git a/engine/src/java/com/runrev/android/nativecontrol/VideoControl.java b/engine/src/java/com/runrev/android/nativecontrol/VideoControl.java
@@ -23,6 +23,7 @@
 import android.view.*;
 import android.widget.*;
 
+
 import java.io.*;
 
 public class VideoControl extends NativeControl
@@ -43,7 +44,15 @@ public View createView(Context context)
     {
         m_video_view = new ExtVideoView(context);
         
-        m_video_controller = new MediaController(context);
+        m_video_controller = new MediaController(context){
+		// PM-2015-10-19: [[ Bug 16027 ]] Make sure the controller does not disappear every
+		// time a control (i.e. Pause button) is clicked. This happened because when touching
+		// the controls, MediaController called show(sDefaultTimeout);
+			@Override
+			public void show(int timeout) {
+				super.show(0);
+			}
+		};
         m_video_view.setMediaController(m_video_controller);
         
         setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
