Merge branch 'dev' into tablet_ui
This commit is contained in:
commit
dc6108c970
179 changed files with 3487 additions and 1697 deletions
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Loading…
Add table
Add a link
Reference in a new issue