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

Merge remote-tracking branch 'origin/dev' into multiple-services

Browse source
This commit is contained in:
wb9688 2017-11-11 13:18:26 +01:00
commit ca48782ad4
245 changed files with 11209 additions and 2124 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/res/xml/appearance_settings.xml
View file

@ -16,4 +16,9 @@
android:key="@string/show_next_video_key"
android:title="@string/show_next_and_similar_title"/>
<SwitchPreference
android:defaultValue="true"
android:key="@string/show_hold_to_append_key"
android:title="@string/show_hold_to_append_title"
android:summary="@string/show_hold_to_append_summary"/>
</PreferenceScreen>

7
app/src/main/res/xml/content_settings.xml
View file

@ -29,5 +29,12 @@
android:key="@string/show_search_suggestions_key"
android:summary="@string/show_search_suggestions_summary"
android:title="@string/show_search_suggestions_title"/>
<ListPreference
android:defaultValue="@string/kiosk_page_key"
android:entries="@array/main_page_content_names"
android:entryValues="@array/main_page_content_pages"
android:key="@string/main_page_content_key"
android:title="@string/main_page_content"
android:summary="%s"/>
</PreferenceScreen>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="external_files" path="."/>
<root-path name="external_files" path="/storage/" />
</paths>