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

1
app/src/main/res/xml/history_settings.xml
View file

@ -21,7 +21,6 @@
<SwitchPreference
android:defaultValue="true"
android:dependency="@string/enable_playback_resume_key"
android:key="@string/enable_playback_state_lists_key"
android:summary="@string/enable_playback_state_lists_summary"
android:title="@string/enable_playback_state_lists_title"

17
app/src/main/res/xml/video_audio_settings.xml
View file

@ -105,6 +105,15 @@
android:summary="@string/minimize_on_exit_summary"
android:title="@string/minimize_on_exit_title"/>
<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="@string/autoplay_value"
android:entries="@array/autoplay_type_description"
android:entryValues="@array/autoplay_type_key"
android:key="@string/autoplay_key"
android:summary="@string/autoplay_summary"
android:title="@string/autoplay_title"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="false"
@ -155,5 +164,13 @@
android:key="@string/seek_duration_key"
android:summary="%s"
android:title="@string/seek_duration_title"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/clear_queue_confirmation_key"
android:summary="@string/clear_queue_confirmation_summary"
android:title="@string/clear_queue_confirmation_title"/>
</PreferenceCategory>
</PreferenceScreen>