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

Merge branch 'dev' into patch-7

Browse source
This commit is contained in:
Christian Schabesberger 2018-10-06 18:16:10 +02:00 • committed by GitHub
commit 6a35494ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 420 additions and 688 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,6 +105,8 @@
<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 -->
<string name="debug_pref_screen_key" translatable="false">debug_pref_screen_key</string>
<string name="allow_heap_dumping_key" translatable="false">allow_heap_dumping_key</string>

1
app/src/main/res/values/strings.xml
View file

@ -517,5 +517,6 @@
<string name="minimize_on_exit_none_description">None</string>
<string name="minimize_on_exit_background_description">Minimize to background player</string>
<string name="minimize_on_exit_popup_description">Minimize to popup player</string>
<string name="switch_view">Switch View</string>
</resources>