merged upstream/dev

This commit is contained in:
Ritvik Saraf 2019-01-29 22:32:58 +05:30
commit 77c6d3d576
119 changed files with 2960 additions and 1715 deletions

View file

@ -29,6 +29,12 @@
android:icon="?attr/language"
android:title="@string/content"/>
<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"
android:icon="?attr/ic_settings_update"
android:title="@string/settings_category_updates_title"
android:key="update_pref_screen_key"/>
<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"
android:icon="?attr/bug"

View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:key="general_preferences"
android:title="@string/settings_category_updates_title">
<SwitchPreference
android:defaultValue="true"
android:key="@string/update_app_key"
android:title="@string/updates_setting_title"
android:summary="@string/updates_setting_description"/>
</PreferenceScreen>