Merge branch 'dev' into tablet_ui

This commit is contained in:
Christian Schabesberger 2018-10-08 11:56:25 +02:00 committed by GitHub
commit dc6108c970
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
179 changed files with 3487 additions and 1697 deletions

View file

@ -36,7 +36,7 @@
android:summary="@string/caption_setting_description"/>
<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.ChoseTabsFragment"
android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"
android:summary="@string/main_page_content_summary"
android:key="@string/main_page_content_key"
android:title="@string/main_page_content"/>

View file

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