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

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>