Merged the latest changes

app/src/main/res/xml/appearance_settings.xml

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

app/src/main/res/xml/content_settings.xml

@@ -3,9 +3,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/content">
+
     <ListPreference
         app:iconSpaceReserved="false"
-        android:defaultValue="@string/default_language_value"
+        android:defaultValue="@string/default_localization_key"
+        android:entries="@array/app_language_name"
+        android:entryValues="@array/app_language_code"
+        android:key="@string/app_language_key"
+        android:summary="%s"
+        android:title="@string/app_language_title"/>
+
+    <ListPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="@string/default_localization_key"
         android:entries="@array/language_names"
         android:entryValues="@array/language_codes"
         android:key="@string/content_language_key"
@@ -14,13 +24,20 @@
 
     <ListPreference
         app:iconSpaceReserved="false"
-        android:defaultValue="@string/default_country_value"
+        android:defaultValue="@string/default_localization_key"
         android:entries="@array/country_names"
         android:entryValues="@array/country_codes"
         android:key="@string/content_country_key"
         android:summary="%s"
         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
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.PeertubeInstanceListFragment"
@@ -34,6 +51,12 @@
         android:key="@string/show_age_restricted_content"
         android:title="@string/show_age_restricted_content_title"/>
 
+    <SwitchPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="false"
+        android:key="@string/youtube_restricted_mode_enabled"
+        android:title="@string/youtube_restricted_mode_enabled_title"/>
+
     <SwitchPreference
         app:iconSpaceReserved="false"
         android:defaultValue="true"
@@ -48,6 +71,12 @@
         android:title="@string/download_thumbnail_title"
         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
         app:iconSpaceReserved="false"
         android:defaultValue="true"
@@ -66,4 +95,26 @@
         android:title="@string/export_data_title"
         android:key="@string/export_data"
         android:summary="@string/export_data_summary"/>
+
+    <PreferenceCategory
+        android:layout="@layout/settings_category_header_layout"
+        android:title="@string/settings_category_feed_title">
+
+        <org.schabi.newpipe.settings.custom.DurationListPreference
+            app:iconSpaceReserved="false"
+            android:key="@string/feed_update_threshold_key"
+            android:defaultValue="@string/feed_update_threshold_default_value"
+            android:entries="@array/feed_update_threshold_options"
+            android:entryValues="@array/feed_update_threshold_values"
+            android:title="@string/feed_update_threshold_title"
+            android:summary="@string/feed_update_threshold_summary"/>
+
+        <SwitchPreference
+            app:iconSpaceReserved="false"
+            android:defaultValue="false"
+            android:key="@string/feed_use_dedicated_fetch_method_key"
+            android:title="@string/feed_use_dedicated_fetch_method_title"
+            android:summary="@string/feed_use_dedicated_fetch_method_summary"/>
+
+    </PreferenceCategory>
 </PreferenceScreen>

app/src/main/res/xml/main_settings.xml

@@ -8,31 +8,31 @@
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.VideoAudioSettingsFragment"
-        android:icon="?attr/audio"
+        android:icon="?attr/ic_headset"
         android:title="@string/settings_category_video_audio_title"/>
 
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.DownloadSettingsFragment"
-        android:icon="?attr/download"
+        android:icon="?attr/ic_file_download"
         android:title="@string/settings_category_downloads_title"/>
 
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.AppearanceSettingsFragment"
-        android:icon="?attr/palette"
+        android:icon="?attr/ic_palette"
         android:title="@string/settings_category_appearance_title"/>
 
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.HistorySettingsFragment"
-        android:icon="?attr/history"
+        android:icon="?attr/ic_history"
         android:title="@string/settings_category_history_title"/>
 
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.ContentSettingsFragment"
-        android:icon="?attr/language"
+        android:icon="?attr/ic_language"
         android:title="@string/content"/>
 
     <PreferenceScreen
@@ -45,7 +45,7 @@
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"
-        android:icon="?attr/bug"
+        android:icon="?attr/ic_bug_report"
         android:title="@string/settings_category_debug_title"
         android:key="@string/debug_pref_screen_key"/>
 </PreferenceScreen>

app/src/main/res/xml/video_audio_settings.xml

@@ -81,6 +81,13 @@
             android:summary="@string/show_play_with_kodi_summary"
             android:title="@string/show_play_with_kodi_title"/>
 
+        <SwitchPreference
+            app:iconSpaceReserved="false"
+            android:defaultValue="true"
+            android:key="@string/enable_lock_screen_video_thumbnail_key"
+            android:summary="@string/enable_lock_screen_video_thumbnail_summary"
+            android:title="@string/enable_lock_screen_video_thumbnail_title"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory