Allow to continue playback when leaving player

4 files changed, 10 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 832386185..733f39b63 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -288,7 +288,9 @@ public class VideoplayerActivity extends MediaplayerActivity {
         public void surfaceDestroyed(SurfaceHolder holder) {
             Log.d(TAG, "Videosurface was destroyed");
             videoSurfaceCreated = false;
-            if (controller != null && !destroyingDueToReload) {
+            if (controller != null && !destroyingDueToReload
+                    && UserPreferences.getVideoBackgroundBehavior()
+                    != UserPreferences.VideoBackgroundBehavior.CONTINUE_PLAYING) {
                 controller.notifyVideoSurfaceAbandoned();
             }
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 5db7c3323..bad48e4cc 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -666,6 +666,7 @@ public class UserPreferences {
         switch (prefs.getString(PREF_VIDEO_BEHAVIOR, "stop")) {
             case "stop": return VideoBackgroundBehavior.STOP;
             case "pip": return VideoBackgroundBehavior.PICTURE_IN_PICTURE;
+            case "continue": return VideoBackgroundBehavior.CONTINUE_PLAYING;
             default: return VideoBackgroundBehavior.STOP;
         }
     }
@@ -849,6 +850,6 @@ public class UserPreferences {
     }
 
     public enum VideoBackgroundBehavior {
-        STOP, PICTURE_IN_PICTURE
+        STOP, PICTURE_IN_PICTURE, CONTINUE_PLAYING
     }
 }
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 3506c0fef..9d9a2453d 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -228,18 +228,22 @@
     <string-array name="video_background_behavior_options">
         <item>@string/stop_playback</item>
         <item>@string/player_go_to_picture_in_picture</item>
+        <item>@string/continue_playback</item>
     </string-array>
 
     <string-array name="video_background_behavior_values">
         <item>stop</item>
         <item>pip</item>
+        <item>continue</item>
     </string-array>
 
     <string-array name="video_background_behavior_options_without_pip">
         <item>@string/stop_playback</item>
+        <item>@string/continue_playback</item>
     </string-array>
 
     <string-array name="video_background_behavior_values_without_pip">
         <item>stop</item>
+        <item>continue</item>
     </string-array>
 </resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b8286cbd0..7bf547e96 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -443,6 +443,7 @@
     <string name="pref_videoBehavior_title">Video behavior</string>
     <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
     <string name="stop_playback">Stop playback</string>
+    <string name="continue_playback">Continue playback</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>