Merge branch 'dev' into alang-selector
This commit is contained in:
commit
2edc223e77
59 changed files with 214 additions and 185 deletions
|
|
@ -229,7 +229,6 @@
|
|||
<string name="show_memory_leaks_key">show_memory_leaks_key</string>
|
||||
<string name="allow_disposed_exceptions_key">allow_disposed_exceptions_key</string>
|
||||
<string name="show_original_time_ago_key">show_original_time_ago_key</string>
|
||||
<string name="disable_media_tunneling_key">disable_media_tunneling_key</string>
|
||||
<string name="show_image_indicators_key">show_image_indicators_key</string>
|
||||
<string name="show_crash_the_player_key">show_crash_the_player_key</string>
|
||||
<string name="check_new_streams_key">check_new_streams</string>
|
||||
|
|
@ -1368,4 +1367,10 @@
|
|||
</string-array>
|
||||
<string name="streams_notifications_channels_key">streams_notifications_channels</string>
|
||||
<string name="player_notification_screen_key">player_notification_screen</string>
|
||||
|
||||
<!-- ExoPlayer settings -->
|
||||
<string name="exoplayer_settings_key">exoplayer_settings_key</string>
|
||||
<string name="disable_media_tunneling_key">disable_media_tunneling_key</string>
|
||||
<string name="use_exoplayer_decoder_fallback_key">use_exoplayer_decoder_fallback_key</string>
|
||||
<string name="always_use_exoplayer_set_output_surface_workaround_key">always_use_exoplayer_set_output_surface_workaround_key</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue