Make it easier to play only audio, not video

3 files changed, 1 insertions, 41 deletions

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 74f89a039..527d1f373 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
@@ -88,7 +88,6 @@ public class UserPreferences {
     private static final String PREF_PLAYBACK_SPEED_ARRAY = "prefPlaybackSpeedArray";
     public static final String PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS = "prefPauseForFocusLoss";
     private static final String PREF_RESUME_AFTER_CALL = "prefResumeAfterCall";
-    public static final String PREF_VIDEO_BEHAVIOR = "prefVideoBehavior";
     private static final String PREF_TIME_RESPECTS_SPEED = "prefPlaybackTimeRespectsSpeed";
     public static final String PREF_STREAM_OVER_DOWNLOAD = "prefStreamOverDownload";
 
@@ -847,15 +846,6 @@ public class UserPreferences {
                 .apply();
     }
 
-    public static VideoBackgroundBehavior getVideoBackgroundBehavior() {
-        switch (prefs.getString(PREF_VIDEO_BEHAVIOR, "pip")) {
-            case "stop": return VideoBackgroundBehavior.STOP;
-            case "continue": return VideoBackgroundBehavior.CONTINUE_PLAYING;
-            case "pip": //Deliberate fall-through
-            default: return VideoBackgroundBehavior.PICTURE_IN_PICTURE;
-        }
-    }
-
     public static EpisodeCleanupAlgorithm getEpisodeCleanupAlgorithm() {
         if (!isEnableAutodownload()) {
             return new APNullCleanupAlgorithm();
@@ -974,10 +964,6 @@ public class UserPreferences {
         return prefs.getBoolean(PREF_CAST_ENABLED, false);
     }
 
-    public enum VideoBackgroundBehavior {
-        STOP, PICTURE_IN_PICTURE, CONTINUE_PLAYING
-    }
-
     public enum BackButtonBehavior {
         DEFAULT, OPEN_DRAWER, DOUBLE_TAP, SHOW_PROMPT, GO_TO_PAGE
     }
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index de83bbf59..f3cf4361d 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -247,28 +247,6 @@
         <item>@string/skip_episode_label</item>
     </string-array>
 
-    <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>
-
     <string-array name="back_button_behavior_options">
         <item>@string/back_button_default</item>
         <item>@string/back_button_go_to_page</item>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 1196c0eee..ed2bd8d54 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -302,7 +302,6 @@
     <string name="playback_error_unknown">Unknown Error</string>
     <string name="no_media_playing_label">No media playing</string>
     <string name="position_default_label" translatable="false">00:00:00</string>
-    <string name="player_go_to_picture_in_picture">Picture-in-picture mode</string>
     <string name="unknown_media_key">AntennaPod - Unknown media key: %1$d</string>
     <string name="error_file_not_found">File not found</string>
     <string name="no_media_label">Item does not contain a media file</string>
@@ -511,10 +510,6 @@
     <string name="media_player_switch_to_exoplayer">Switch to ExoPlayer</string>
     <string name="media_player_switched_to_exoplayer">Switched to ExoPlayer.</string>
     <string name="pref_skip_silence_title">Skip Silence in Audio</string>
-    <string name="pref_videoBehavior_title">Upon exiting video</string>
-    <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
-    <string name="stop_playback">Stop playback</string>
-    <string name="continue_playback">Continue audio playback</string>
     <string name="behavior">Behavior</string>
     <string name="pref_back_button_behavior_title">Back Button Behavior</string>
     <string name="pref_back_button_behavior_sum">Change behavior of the back button.</string>
@@ -793,6 +788,7 @@
     <string name="stereo_to_mono">Downmix: Stereo to mono</string>
     <string name="sonic_only">Sonic only</string>
     <string name="exoplayer_only">ExoPlayer only</string>
+    <string name="player_switch_to_audio_only">Switch to audio only</string>
 
     <!-- proxy settings -->
     <string name="proxy_type_label">Type</string>