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

Merge branch 'dev' into tablet_ui

Browse source
This commit is contained in:
Christian Schabesberger 2018-08-28 21:28:10 +02:00 • committed by GitHub
commit 42739c8cf0
82 changed files with 1941 additions and 867 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,4 +34,11 @@
android:key="@string/caption_settings_key"
android:title="@string/caption_setting_title"
android:summary="@string/caption_setting_description"/>
<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.ChoseTabsFragment"
android:summary="@string/main_page_content_summary"
android:key="@string/main_page_content_key"
android:title="@string/main_page_content"/>
</PreferenceScreen>

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

@ -43,14 +43,6 @@
android:title="@string/download_thumbnail_title"
android:summary="@string/download_thumbnail_summary"/>
<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"/>
<Preference
android:summary="@string/import_data_summary"
android:key="@string/import_data"