Merge branch 'dev' into tablet_ui

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

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>