Updated the VideoView to leave the final frame intact when a video ha…

…s played to completion (brianwernick#420)

library/src/main/java/com/devbrackets/android/exomedia/core/api/VideoViewApi.java

@@ -74,8 +74,10 @@ interface OnSurfaceSizeChanged {
 
     /**
      * Performs the functionality to stop the video in playback
+     *
+     * @param clearSurface <code>true</code> if the surface should be cleared
      */
-    void stopPlayback();
+    void stopPlayback(boolean clearSurface);
 
     /**
      * Prepares the media previously specified for playback.  This should only be called after

library/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoSurfaceVideoView.java

@@ -110,8 +110,8 @@ public void pause() {
     }
 
     @Override
-    public void stopPlayback() {
-        delegate.stopPlayback();
+    public void stopPlayback(boolean clearSurface) {
+        delegate.stopPlayback(clearSurface);
     }
 
     @Override

library/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoTextureVideoView.java

@@ -111,8 +111,8 @@ public void pause() {
     }
 
     @Override
-    public void stopPlayback() {
-        delegate.stopPlayback();
+    public void stopPlayback(boolean clearSurface) {
+        delegate.stopPlayback(clearSurface);
     }
 
     @Override

library/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoVideoDelegate.java

@@ -124,10 +124,18 @@ public void pause() {
         playRequested = false;
     }
 
-    public void stopPlayback() {
+    /**
+     * Performs the functionality to stop the video in playback
+     *
+     * @param clearSurface <code>true</code> if the surface should be cleared
+     */
+    public void stopPlayback(boolean clearSurface) {
         exoMediaPlayer.stop();
         playRequested = false;
-        listenerMux.clearSurfaceWhenReady(clearableSurface);
+
+        if (clearSurface) {
+            listenerMux.clearSurfaceWhenReady(clearableSurface);
+        }
     }
 
     public void suspend() {

library/src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeSurfaceVideoView.java

@@ -163,8 +163,8 @@ public boolean restart() {
     }
 
     @Override
-    public void stopPlayback() {
-        delegate.stopPlayback();
+    public void stopPlayback(boolean clearSurface) {
+        delegate.stopPlayback(clearSurface);
     }
 
     @Override

library/src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeTextureVideoView.java

@@ -168,8 +168,8 @@ public boolean restart() {
     }
 
     @Override
-    public void stopPlayback() {
-        delegate.stopPlayback();
+    public void stopPlayback(boolean clearSurface) {
+        delegate.stopPlayback(clearSurface);
     }
 
     @Override

library/src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeVideoDelegate.java

@@ -134,7 +134,7 @@ public long getCurrentPosition() {
 
     public void seekTo(long milliseconds) {
         if (isReady()) {
-            mediaPlayer.seekTo((int)milliseconds);
+            mediaPlayer.seekTo((int) milliseconds);
             requestedSeek = 0;
         } else {
             requestedSeek = milliseconds;
@@ -168,8 +168,10 @@ public boolean setPlaybackSpeed(float speed) {
 
     /**
      * Performs the functionality to stop the video in playback
+     *
+     * @param clearSurface <code>true</code> if the surface should be cleared
      */
-    public void stopPlayback() {
+    public void stopPlayback(boolean clearSurface) {
         currentState = State.IDLE;
 
         if (isReady()) {
@@ -181,7 +183,9 @@ public void stopPlayback() {
         }
 
         playRequested = false;
-        listenerMux.clearSurfaceWhenReady(clearableSurface);
+        if (clearSurface) {
+            listenerMux.clearSurfaceWhenReady(clearableSurface);
+        }
     }
 
     /**
@@ -202,7 +206,7 @@ public void suspend() {
     }
 
     public boolean restart() {
-        if(currentState != State.COMPLETED) {
+        if (currentState != State.COMPLETED) {
             return false;
         }
 

library/src/main/java/com/devbrackets/android/exomedia/ui/widget/VideoView.java

@@ -409,13 +409,7 @@ public void pause() {
      * If a video is currently in playback then the playback will be stopped
      */
     public void stopPlayback() {
-        audioFocusHelper.abandonFocus();
-        videoViewImpl.stopPlayback();
-        setKeepScreenOn(false);
-
-        if (videoControls != null) {
-            videoControls.updatePlaybackState(false);
-        }
+        stopPlayback(true);
     }
 
     /**
@@ -768,7 +762,25 @@ protected int getVideoViewApiImplementation(@NonNull Context context, @NonNull A
      * procedures from running that we no longer need.
      */
     protected void onPlaybackEnded() {
-        stopPlayback();
+        stopPlayback(false);
+    }
+
+    /**
+     * Stops the video currently in playback, making sure to only clear the surface
+     * when requested. This allows us to leave the last frame of a video intact when
+     * it plays to completion while still clearing it when the user requests playback
+     * to stop.
+     *
+     * @param clearSurface <code>true</code> if the surface should be cleared
+     */
+    protected void stopPlayback(boolean clearSurface) {
+        audioFocusHelper.abandonFocus();
+        videoViewImpl.stopPlayback(clearSurface);
+        setKeepScreenOn(false);
+
+        if (videoControls != null) {
+            videoControls.updatePlaybackState(false);
+        }
     }
 
     protected class AudioFocusHelper implements AudioManager.OnAudioFocusChangeListener {