be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3184 from opusforlife2/relocate_settings 

Relocate two settings from Appearance to Content
This commit is contained in:
Stypox 2020-03-08 17:12:38 +01:00 committed by GitHub
parent 8fa29ffc19 7da11206da
commit 64c289c014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/res/xml/appearance_settings.xml
View File

@ -13,12 +13,6 @@
android:summary="%s" android:summary="%s"
android:title="@string/theme_title"/> android:title="@string/theme_title"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/show_next_video_key"
android:title="@string/show_next_and_similar_title"/>
<SwitchPreference <SwitchPreference
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
android:defaultValue="true" android:defaultValue="true"
@ -41,11 +35,4 @@
android:title="@string/caption_setting_title" android:title="@string/caption_setting_title"
android:summary="@string/caption_setting_description"/> android:summary="@string/caption_setting_description"/>
<PreferenceScreen
app:iconSpaceReserved="false"
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"/>
</PreferenceScreen> </PreferenceScreen>

13
app/src/main/res/xml/content_settings.xml
View File

@ -31,6 +31,13 @@
android:summary="%s" android:summary="%s"
android:title="@string/default_content_country_title"/> android:title="@string/default_content_country_title"/>
<PreferenceScreen
app:iconSpaceReserved="false"
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"/>
<PreferenceScreen <PreferenceScreen
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
android:fragment="org.schabi.newpipe.settings.PeertubeInstanceListFragment" android:fragment="org.schabi.newpipe.settings.PeertubeInstanceListFragment"
@ -58,6 +65,12 @@
android:title="@string/download_thumbnail_title" android:title="@string/download_thumbnail_title"
android:summary="@string/download_thumbnail_summary"/> android:summary="@string/download_thumbnail_summary"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/show_next_video_key"
android:title="@string/show_next_and_similar_title"/>
<SwitchPreference <SwitchPreference
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
android:defaultValue="true" android:defaultValue="true"