Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into pr3178

Browse source
This commit is contained in:
Stypox 2020-08-02 22:59:43 +02:00
commit 963ee4dbab
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
130 changed files with 7247 additions and 7180 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/res/values/settings_keys.xml
View file

@ -28,6 +28,7 @@
<string name="auto_queue_key" translatable="false">auto_queue_key</string>
<string name="screen_brightness_key" translatable="false">screen_brightness_key</string>
<string name="screen_brightness_timestamp_key" translatable="false">screen_brightness_timestamp_key</string>
<string name="clear_queue_confirmation_key" translatable="false">clear_queue_confirmation_key</string>
<string name="seek_duration_key" translatable="false">seek_duration</string>
<string name="seek_duration_default_value" translatable="false">10000</string>
@ -66,6 +67,23 @@
<item>@string/minimize_on_exit_popup_description</item>
</string-array>
<string name="autoplay_key" translatable="false">autoplay_key</string>
<string name="autoplay_value" translatable="false">@string/autoplay_wifi_key</string>
<string name="autoplay_always_key" translatable="false">autoplay_always_key</string>
<string name="autoplay_wifi_key" translatable="false">autoplay_wifi_key</string>
<string name="autoplay_never_key" translatable="false">autoplay_never_key</string>
<string-array name="autoplay_type_key" translatable="false">
<item>@string/autoplay_always_key</item>
<item>@string/autoplay_wifi_key</item>
<item>@string/autoplay_never_key</item>
</string-array>
<string-array name="autoplay_type_description" translatable="false">
<item>@string/autoplay_always_description</item>
<item>@string/autoplay_wifi_description</item>
<item>@string/autoplay_never_description</item>
</string-array>
<string name="default_resolution_key" translatable="false">default_resolution</string>
<string name="default_resolution_value" translatable="false">360p</string>
<string name="show_higher_resolutions_key" translatable="false">show_higher_resolutions</string>
@ -233,8 +251,6 @@
<item>@string/audio_webm_key</item>
</string-array>
<string name="last_orientation_landscape_key" translatable="false">last_orientation_landscape_key</string>
<string name="last_resize_mode" translatable="false">last_resize_mode</string>
<!-- DEBUG ONLY -->