Merge pull request livecode#3029 from livecodepanos/bugfix-16027

livecodesebastien · livecodesebastien · commit 6520b49e5fbd · 2015-10-13T13:00:30.000+01:00
[Bug 16027] Set permanent visibility of Android audio/video controller
diff --git a/docs/notes/bugfix-16027.md b/docs/notes/bugfix-16027.md
@@ -0,0 +1 @@
+#  Android audio/video controller disappears after some seconds of inactivity
diff --git a/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java b/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java
@@ -316,7 +316,7 @@ public void setMediaController(MediaController controller) {
         mMediaController = controller;
         attachMediaController();
     }
-    
+	
     public MediaController getMediaController() {
         return mMediaController;
     }
@@ -391,7 +391,8 @@ public void onPrepared(MediaPlayer mp) {
                     if (mTargetState == STATE_PLAYING) {
                         start();
                         if (mMediaController != null) {
-                            mMediaController.show();
+							// 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)) {
@@ -406,6 +407,10 @@ 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);
+					}
                 }
             }
         }
@@ -538,7 +543,7 @@ public void surfaceChanged(SurfaceHolder holder, int format,
                 }
                 start();
                 if (mMediaController != null) {
-                    mMediaController.show();
+                    mMediaController.show(0);
                 }
             }
         }
@@ -621,7 +626,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
                     keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
                 if (mMediaPlayer.isPlaying()) {
                     pause();
-                    mMediaController.show();
+                    mMediaController.show(0);
                 } else {
                     start();
                     mMediaController.hide();
@@ -630,7 +635,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
             } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
                     && mMediaPlayer.isPlaying()) {
                 pause();
-                mMediaController.show();
+                mMediaController.show(0);
             } else {
                 toggleMediaControlsVisiblity();
             }
@@ -644,7 +649,7 @@ private void toggleMediaControlsVisiblity() {
         if (mMediaController.isShowing()) {
             mMediaController.hide();
         } else {
-            mMediaController.show();
+            mMediaController.show(0);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Android audio/video controller disappears after some seconds of inactivity`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public void setMediaController(MediaController controller) {`
`316`	`316`	`mMediaController = controller;`
`317`	`317`	`attachMediaController();`
`318`	`318`	`}`
`319`		`-`
	`319`	`+`
`320`	`320`	`public MediaController getMediaController() {`
`321`	`321`	`return mMediaController;`
`322`	`322`	`}`
`@@ -391,7 +391,8 @@ public void onPrepared(MediaPlayer mp) {`
`391`	`391`	`if (mTargetState == STATE_PLAYING) {`
`392`	`392`	`start();`
`393`	`393`	`if (mMediaController != null) {`
`394`		`- mMediaController.show();`
	`394`	`+ // PM-2015-10-08: [[ Bug 16027 ]] Make sure the controller does not disappear after some ms of inactivity`
	`395`	`+ mMediaController.show(0);`
`395`	`396`	`}`
`396`	`397`	`} else if (!isPlaying() &&`
`397`	`398`	`(seekToPosition != 0 \|\| getCurrentPosition() > 0)) {`
`@@ -406,6 +407,10 @@ public void onPrepared(MediaPlayer mp) {`
`406`	`407`	`// The video size might be reported to us later.`
`407`	`408`	`if (mTargetState == STATE_PLAYING) {`
`408`	`409`	`start();`
	`410`	`+ // show the controller when starting playing a remote video`
	`411`	`+ if (mMediaController != null) {`
	`412`	`+ mMediaController.show(0);`
	`413`	`+ }`
`409`	`414`	`}`
`410`	`415`	`}`
`411`	`416`	`}`
`@@ -538,7 +543,7 @@ public void surfaceChanged(SurfaceHolder holder, int format,`
`538`	`543`	`}`
`539`	`544`	`start();`
`540`	`545`	`if (mMediaController != null) {`
`541`		`- mMediaController.show();`
	`546`	`+ mMediaController.show(0);`
`542`	`547`	`}`
`543`	`548`	`}`
`544`	`549`	`}`
`@@ -621,7 +626,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)`
`621`	`626`	`keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {`
`622`	`627`	`if (mMediaPlayer.isPlaying()) {`
`623`	`628`	`pause();`
`624`		`- mMediaController.show();`
	`629`	`+ mMediaController.show(0);`
`625`	`630`	`} else {`
`626`	`631`	`start();`
`627`	`632`	`mMediaController.hide();`
`@@ -630,7 +635,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event)`
`630`	`635`	`} else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP`
`631`	`636`	`&& mMediaPlayer.isPlaying()) {`
`632`	`637`	`pause();`
`633`		`- mMediaController.show();`
	`638`	`+ mMediaController.show(0);`
`634`	`639`	`} else {`
`635`	`640`	`toggleMediaControlsVisiblity();`
`636`	`641`	`}`
`@@ -644,7 +649,7 @@ private void toggleMediaControlsVisiblity() {`
`644`	`649`	`if (mMediaController.isShowing()) {`
`645`	`650`	`mMediaController.hide();`
`646`	`651`	`} else {`
`647`		`- mMediaController.show();`
	`652`	`+ mMediaController.show(0);`
`648`	`653`	`}`
`649`	`654`	`}`
`650`	`655`