Merge pull request #1 from AntennaPod/develop

upstream

1 files changed, 81 insertions, 0 deletions

diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 45650495c..12961504c 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -137,10 +137,12 @@
     <string-array name="theme_options">
         <item>@string/pref_theme_title_light</item>
         <item>@string/pref_theme_title_dark</item>
+        <item>@string/pref_theme_title_trueblack</item>
     </string-array>
     <string-array name="theme_values">
         <item>0</item>
         <item>1</item>
+        <item>2</item>
     </string-array>
 
     <string-array name="nav_drawer_titles">
@@ -181,6 +183,28 @@
         <item>3</item>
     </string-array>
 
+    <string-array name="media_player_options">
+        <item>@string/media_player_builtin</item>
+        <item>@string/media_player_sonic</item>
+        <item>@string/media_player_exoplayer</item>
+    </string-array>
+
+    <string-array name="media_player_values">
+        <item>builtin</item>
+        <item>sonic</item>
+        <item>exoplayer</item>
+    </string-array>
+
+    <string-array name="media_player_options_no_sonic">
+        <item>@string/media_player_builtin</item>
+        <item>@string/media_player_exoplayer</item>
+    </string-array>
+
+    <string-array name="media_player_values_no_sonic">
+        <item>builtin</item>
+        <item>exoplayer</item>
+    </string-array>
+
     <string-array name="episode_filter_options">
         <item>@string/hide_unplayed_episodes_label</item>
         <item>@string/hide_paused_episodes_label</item>
@@ -190,6 +214,7 @@
         <item>@string/hide_downloaded_episodes_label</item>
         <item>@string/hide_not_downloaded_episodes_label</item>
         <item>@string/hide_has_media_label</item>
+        <item>@string/hide_is_favorite_label</item>
     </string-array>
 
     <string-array name="episode_filter_values">
@@ -201,6 +226,7 @@
         <item>downloaded</item>
         <item>not_downloaded</item>
         <item>has_media</item>
+        <item>is_favorite</item>
     </string-array>
 
     <string-array name="image_cache_size_options">
@@ -224,4 +250,59 @@
         <item>@string/fast_forward_label</item>
         <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="batch_long_press_options">
+        <item>@string/select_all_above</item>
+        <item>@string/select_all_below</item>
+    </string-array>
+
+    <string-array name="back_button_behavior_options">
+        <item>@string/back_button_default</item>
+        <item>@string/back_button_go_to_page</item>
+        <item>@string/back_button_open_drawer</item>
+        <item>@string/back_button_double_tap</item>
+        <item>@string/back_button_show_prompt</item>
+    </string-array>
+
+    <string-array name="back_button_behavior_values">
+        <item>default</item>
+        <item>page</item>
+        <item>drawer</item>
+        <item>doubletap</item>
+        <item>prompt</item>
+    </string-array>
+
+    <string-array name="back_button_go_to_pages">
+        <item>@string/queue_label</item>
+        <item>@string/episodes_label</item>
+        <item>@string/subscriptions_label</item>
+    </string-array>
+
+    <string-array name="back_button_go_to_pages_tags">
+        <item>QueueFragment</item>
+        <item>EpisodesFragment</item>
+        <item>SubscriptionFragment</item>
+    </string-array>
 </resources>