reflect changes in resources

src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/speed_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_speed_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/whitelist_button" style="@style/YouTubePlayerButton"/>
     <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/whitelist_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_whitelist_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/copy_button" style="@style/YouTubePlayerButton"/>
     <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_copy_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/copy_with_timestamp_button" style="@style/YouTubePlayerButton"/>
     <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_with_timestamp_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_copy_icon_with_time" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/autoreplay_button" style="@style/YouTubePlayerButton"/>

src/main/resources/youtube/settings/host/values/strings.xml

@@ -41,6 +41,7 @@
     <string name="general_time_without_sb_sum">This time appears in brackets next to the current time. This shows the total video duration minus any segments.</string>
     <string name="general_uuid">Your private user id</string>
     <string name="general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
+    <string name="hours">hours</string>
     <string name="microg_not_installed_notice">Please install MicroG</string>
     <string name="microg_not_installed_warning">MicroG is not found</string>
     <string name="microg_not_running_warning">MicroG does not run in the background</string>
@@ -164,13 +165,11 @@ Is it ready to submit?"</string>
     <string name="revanced_adremover_web_search_panel_summary_off">Web search panels are shown</string>
     <string name="revanced_adremover_web_search_panel_summary_on">Web search panels are hidden</string>
     <string name="revanced_adremover_web_search_panel_title">Hide web search panels</string>
+    <string name="revanced_backup_settings_summary">Import ReVanced settings from file or export ReVanced settings to file</string>
     <string name="revanced_custom_seekbar_color_value_summary">Type the hex code of the seekbar color to use in dark mode</string>
     <string name="revanced_custom_seekbar_color_value_title">Custom seekbar color value</string>
-    <string name="revanced_default_video_quality_mobile_summary">Select default video resolution on Cellular Network</string>
     <string name="revanced_default_video_quality_mobile_title">Default video quality Cellular</string>
-    <string name="revanced_default_video_quality_wifi_summary">Select default video resolution on Wi-Fi Network</string>
     <string name="revanced_default_video_quality_wifi_title">Default video quality Wi-Fi</string>
-    <string name="revanced_default_video_speed_summary">Select default video speed</string>
     <string name="revanced_default_video_speed_title">Default video speed</string>
     <string name="revanced_downloader_not_installed">is not installed. Please install it.</string>
     <string name="revanced_downloader_package_name_summary">"Package name of the downloader app such as NewPipe's or PowerTube's"</string>
@@ -213,8 +212,8 @@ Is it ready to submit?"</string>
     <string name="revanced_enable_old_quality_layout_summary_off">New style quality settings are shown</string>
     <string name="revanced_enable_old_quality_layout_summary_on">Old style quality settings are shown</string>
     <string name="revanced_enable_old_quality_layout_title">Enable old style quality layout</string>
-    <string name="revanced_enable_open_links_directly_summary_off">URL redirect (youtube.com/redirect) is used when opening links in video descriptions</string>
+    <string name="revanced_enable_open_links_directly_summary_off">Following default redirect policy</string>
-    <string name="revanced_enable_open_links_directly_summary_on">Bypass URL redirects (youtube.com/redirect) when opening links in video descriptions</string>
+    <string name="revanced_enable_open_links_directly_summary_on">Bypassing URL redirects</string>
     <string name="revanced_enable_open_links_directly_title">Enable open links directly</string>
     <string name="revanced_enable_press_to_swipe_summary_off">Press-to-swipe is disabled</string>
     <string name="revanced_enable_press_to_swipe_summary_on">Press-to-swipe is enabled</string>
@@ -228,6 +227,9 @@ Is it ready to submit?"</string>
     <string name="revanced_enable_save_video_quality_summary_off">Does not save video quality values even when changing video quality</string>
     <string name="revanced_enable_save_video_quality_summary_on">Save the video quality value whenever you change the video quality</string>
     <string name="revanced_enable_save_video_quality_title">Enable save video quality</string>
+    <string name="revanced_enable_save_video_speed_summary_off">Does not save video speed values even when changing video speed</string>
+    <string name="revanced_enable_save_video_speed_summary_on">Save the video speed value whenever you change the video speed</string>
+    <string name="revanced_enable_save_video_speed_title">Enable save video speed</string>
     <string name="revanced_enable_seekbar_tapping_summary_on">Seekbar tapping is enabled</string>
     <string name="revanced_enable_seekbar_tapping_title">Enable seekbar tapping</string>
     <string name="revanced_enable_swipe_auto_brightness_summary_off">Even if the brightness is set to 0 by swiping, auto brightness is not activated</string>
@@ -256,10 +258,14 @@ Is it ready to submit?"</string>
     <string name="revanced_enable_vp9_codec_summary">Spoof device information to enable VP9 codec</string>
     <string name="revanced_enable_vp9_codec_title">Enable VP9 codec</string>
     <string name="revanced_experimental_flag">Experimental Flags</string>
+    <string name="revanced_export_settings_summary">Save your ReVanced settings to file</string>
+    <string name="revanced_export_settings_title">Export settings</string>
     <string name="revanced_extended_issue_center_summary">Report issues or leave suggestions here</string>
     <string name="revanced_extended_issue_center_title">ReVanced Extended Issue Center</string>
     <string name="revanced_extended_settings_summary">ReVanced Extended specific settings</string>
     <string name="revanced_extended_settings_title">ReVanced Extended settings</string>
+    <string name="revanced_general_layout_settings_summary">General layout related settings</string>
+    <string name="revanced_general_layout_settings_title">General layout settings</string>
     <string name="revanced_hide_auto_captions_summary_off">Captions are enabled when playing a video with captioning is enforced</string>
     <string name="revanced_hide_auto_captions_summary_on">"Captions aren't enabled when playing a video with captioning is enforced"</string>
     <string name="revanced_hide_auto_captions_title">Hide auto captions</string>
@@ -333,15 +339,18 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_filmstrip_overlay_summary_off">Film strip overlay are shown</string>
     <string name="revanced_hide_filmstrip_overlay_summary_on">Film strip overlay are hidden</string>
     <string name="revanced_hide_filmstrip_overlay_title">Hide film strip overlay</string>
+    <string name="revanced_hide_floating_microphone_summary_off">Floating microphone button is shown</string>
+    <string name="revanced_hide_floating_microphone_summary_on">Floating microphone button is hidden</string>
+    <string name="revanced_hide_floating_microphone_title">Hide floating microphone button</string>
+    <string name="revanced_hide_fullscreen_button_container_summary_off">Fullscreen button container is shown</string>
+    <string name="revanced_hide_fullscreen_button_container_summary_on">Fullscreen button container is hidden</string>
+    <string name="revanced_hide_fullscreen_button_container_title">Hide fullscreen button container</string>
     <string name="revanced_hide_fullscreen_panels_summary_off">Fullscreen panels are shown</string>
     <string name="revanced_hide_fullscreen_panels_summary_on">Fullscreen panels are hidden</string>
     <string name="revanced_hide_fullscreen_panels_title">Hide fullscreen panels</string>
     <string name="revanced_hide_info_cards_summary_off">Info cards are shown</string>
     <string name="revanced_hide_info_cards_summary_on">Info cards are hidden</string>
     <string name="revanced_hide_info_cards_title">Hide info cards</string>
-    <string name="revanced_hide_live_chat_button_summary_off">Live chat button is shown</string>
-    <string name="revanced_hide_live_chat_button_summary_on">Live chat button is hidden</string>
-    <string name="revanced_hide_live_chat_button_title">Hide live chat button</string>
     <string name="revanced_hide_menu_ambient_mode_summary_off">Ambient mode menu is shown</string>
     <string name="revanced_hide_menu_ambient_mode_summary_on">Ambient mode menu is hidden</string>
     <string name="revanced_hide_menu_ambient_mode_title">Hide ambient mode menu</string>
@@ -381,6 +390,9 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_next_button_summary_off">Next button is shown</string>
     <string name="revanced_hide_next_button_summary_on">Next button is hidden</string>
     <string name="revanced_hide_next_button_title">Hide next button</string>
+    <string name="revanced_hide_player_button_background_summary_off">Player button background is shown</string>
+    <string name="revanced_hide_player_button_background_summary_on">Player button background is hidden</string>
+    <string name="revanced_hide_player_button_background_title">Hide player button background</string>
     <string name="revanced_hide_player_overlay_filter_summary_off">Player overlay filter is shown</string>
     <string name="revanced_hide_player_overlay_filter_summary_on">Player overlay filter is hidden</string>
     <string name="revanced_hide_player_overlay_filter_title">Hide player overlay filter</string>
@@ -429,17 +441,18 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_time_and_seekbar_summary_off">Time and seekbar are shown</string>
     <string name="revanced_hide_time_and_seekbar_summary_on">Time and seekbar are hidden</string>
     <string name="revanced_hide_time_and_seekbar_title">Hide time and seekbar</string>
+    <string name="revanced_import_settings_summary">Fetch ReVanced settings from saved file</string>
+    <string name="revanced_import_settings_title">Import settings</string>
     <string name="revanced_layout_settings_bottomplayer">Bottom player layout settings</string>
     <string name="revanced_layout_settings_flyoutmenu">Flyout menu layout settings</string>
     <string name="revanced_layout_settings_fullscreen">Fullscreen layout settings</string>
-    <string name="revanced_layout_settings_general">General layout settings</string>
     <string name="revanced_layout_settings_player">Player layout settings</string>
     <string name="revanced_layout_settings_seekbar">Seekbar layout settings</string>
-    <string name="revanced_layout_settings_summary">Layout related settings</string>
-    <string name="revanced_layout_settings_title">Layout settings</string>
     <string name="revanced_misc_settings_summary">Miscellaneous related settings</string>
     <string name="revanced_misc_settings_title">Miscellaneous settings</string>
     <string name="revanced_others_title">Others</string>
+    <string name="revanced_other_layout_settings_summary">Other layout related settings</string>
+    <string name="revanced_other_layout_settings_title">Other layout settings</string>
     <string name="revanced_overlay_button_auto_repeat_summary_off">Auto repeat button is hidden</string>
     <string name="revanced_overlay_button_auto_repeat_summary_on">Auto repeat button is shown</string>
     <string name="revanced_overlay_button_auto_repeat_title">Show auto repeat button</string>
@@ -454,6 +467,10 @@ Is it ready to submit?"</string>
     <string name="revanced_overlay_button_downloads_title">Show download button</string>
     <string name="revanced_overlay_button_summary">Overlay button related settings</string>
     <string name="revanced_overlay_button_title">Overlay button settings</string>
+    <string name="revanced_overlay_button_speed_reset">Video speed reseted (1.0x)</string>
+    <string name="revanced_overlay_button_speed_summary_off">Speed button is hidden</string>
+    <string name="revanced_overlay_button_speed_summary_on">Speed button is shown</string>
+    <string name="revanced_overlay_button_speed_title">Show speed button</string>
     <string name="revanced_overlay_button_whitelist_summary_off">Whitelist button is hidden</string>
     <string name="revanced_overlay_button_whitelist_summary_on">Whitelist button is shown</string>
     <string name="revanced_overlay_button_whitelist_title">Show whitelist button</string>
@@ -503,6 +520,7 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_save_video_quality_mobile_error">Failed to change default mobile data quality</string>
     <string name="revanced_save_video_quality_wifi">Changing default Wi-Fi quality to:</string>
     <string name="revanced_save_video_quality_wifi_error">Failed to change default WI-FI quality</string>
+    <string name="revanced_save_video_speed">Changing default speed to:</string>
     <string name="revanced_sponsorblock_settings_summary">SponsorBlock related settings</string>
     <string name="revanced_sponsorblock_settings_title">SponsorBlock settings</string>
     <string name="revanced_swipe_controls_summary">Swipe controls related settings</string>
@@ -549,6 +567,7 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="sb_guidelines_preference_title">View guidelines</string>
     <string name="sb_switching_success">Switched successfully. reload the video</string>
     <string name="sb_switching_to_mirror">Switching mirror API server to main API server..</string>
+    <string name="seconds">seconds</string>
     <string name="segments_endcards">Endcards/Credits</string>
     <string name="segments_endcards_sum">Credits or when the YouTube endcards appear. Not for spoken conclusions</string>
     <string name="segments_filler">Filler Tangent/Jokes</string>
@@ -566,6 +585,7 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="segments_subscribe">Interaction Reminder (Subscribe)</string>
     <string name="segments_subscribe_sum">When there is a short reminder to like, subscribe, follow or interact with them on any free or paid platform</string>
     <string name="settings_export_failed">Failed to export settings</string>
+    <string name="settings_export_successful">Settings were successfully exported</string>
     <string name="settings_ie">Import/Export settings</string>
     <string name="settings_ie_sum">This is your entire configuration that is applicable in the desktop extension in JSON. This includes your Private userID, so be sure to share this wisely.</string>
     <string name="settings_import_failed">Failed to import settings</string>

src/main/resources/youtube/settings/values-v21/strings.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Translation Exception Language Resources -->
+    <string name="revanced_backup_settings_title">@string/settings_ie</string>
+    <string name="revanced_hide_live_chat_button_summary_off">@string/revanced_hide_button_live_chat_summary_off</string>
+    <string name="revanced_hide_live_chat_button_summary_on">@string/revanced_hide_button_live_chat_summary_on</string>
+    <string name="revanced_hide_live_chat_button_title">@string/revanced_hide_button_live_chat_title</string>
+
     <string name="revanced_icons_blue">afn / blue</string>
     <string name="revanced_icons_default">stock</string>
     <string name="revanced_icons_red">afn / red</string>

src/main/resources/youtube/settings/xml/revanced_prefs.xml

@@ -26,34 +26,13 @@
         <PreferenceScreen android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_filter" android:summary="@string/revanced_adremover_custom_filter_summary" >
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_adremover_custom_filter_title" />
             <SwitchPreference android:title="@string/revanced_adremover_user_filter_title" android:key="revanced_adremover_user_filter" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_user_filter_summary_on" android:summaryOff="@string/revanced_adremover_user_filter_summary_off" />
-            <EditTextPreference android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_strings" android:summary="@string/revanced_adremover_custom_filter_summary" android:defaultValue="" android:inputType="text" />
+            <EditTextPreference android:title="@string/revanced_adremover_custom_filter_title" android:key="revanced_adremover_custom_strings" android:summary="@string/revanced_adremover_custom_filter_summary" android:defaultValue="" android:inputType="text" android:dependency="revanced_adremover_user_filter" />
         </PreferenceScreen>SETTINGS: HIDE_GENERAL_ADS -->
 
     <!-- PREFERENCE: ADS_SETTINGS
     </PreferenceScreen>PREFERENCE: ADS_SETTINGS -->
 
 
-    <!-- PREFERENCE: VIDEO_SETTINGS
-    <PreferenceScreen android:title="@string/revanced_video_settings_title" android:key="video_settings" android:summary="@string/revanced_video_settings_summary">
-        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_settings_title" />PREFERENCE: VIDEO_SETTINGS -->
-
-        <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
-        <ListPreference android:title="@string/revanced_default_video_quality_wifi_title" android:key="revanced_default_video_quality_wifi" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />
-        <ListPreference android:title="@string/revanced_default_video_quality_mobile_title" android:key="revanced_default_video_quality_mobile" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
-
-        <!-- SETTINGS: DEFAULT_VIDEO_SPEED
-        <ListPreference android:title="@string/revanced_default_video_speed_title" android:key="revanced_default_video_speed" android:summary="@string/revanced_default_video_speed_summary" android:entries="@array/revanced_default_video_speed_entry" android:defaultValue="-2.0" android:entryValues="@array/revanced_default_video_speed_entry_value" />SETTINGS: DEFAULT_VIDEO_SPEED -->
-
-        <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
-        <SwitchPreference android:title="@string/revanced_enable_save_video_quality_title" android:key="revanced_enable_save_video_quality" android:defaultValue="false" android:summaryOn="@string/revanced_enable_save_video_quality_summary_on" android:summaryOff="@string/revanced_enable_save_video_quality_summary_off" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
-
-        <!-- SETTINGS: CUSTOM_VIDEO_SPEED
-        <SwitchPreference android:title="@string/revanced_enable_custom_video_speed_title" android:key="revanced_enable_custom_video_speed" android:defaultValue="false" android:summaryOn="@string/revanced_enable_custom_video_speed_summary_on" android:summaryOff="@string/revanced_enable_custom_video_speed_summary_off" />SETTINGS: CUSTOM_VIDEO_SPEED -->
-
-    <!-- PREFERENCE: VIDEO_SETTINGS
-    </PreferenceScreen>PREFERENCE: VIDEO_SETTINGS -->
-
-
     <!-- PREFERENCE: SWIPE_SETTINGS
     <PreferenceScreen android:title="@string/revanced_swipe_controls_title" android:key="swipe_controls" android:summary="@string/revanced_swipe_controls_summary">
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls_title" />PREFERENCE: SWIPE_SETTINGS -->
@@ -138,6 +117,9 @@
         <!-- SETTINGS: HIDE_SNACKBAR
         <SwitchPreference android:title="@string/revanced_hide_snackbar_title" android:key="revanced_hide_snackbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_snackbar_summary_on" android:summaryOff="@string/revanced_hide_snackbar_summary_off" />SETTINGS: HIDE_SNACKBAR -->
 
+        <!-- SETTINGS: HIDE_FLOATING_MICROPHONE
+        <SwitchPreference android:title="@string/revanced_hide_floating_microphone_title" android:key="revanced_hide_floating_microphone" android:defaultValue="true" android:summaryOn="@string/revanced_hide_floating_microphone_summary_on" android:summaryOff="@string/revanced_hide_floating_microphone_summary_off" />SETTINGS: HIDE_FLOATING_MICROPHONE -->
+
         <!-- SETTINGS: HIDE_GENERAL_LAYOUT_ADS
         <SwitchPreference android:title="@string/revanced_adremover_merchandise_title" android:key="revanced_adremover_merchandise" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_merchandise_summary_on" android:summaryOff="@string/revanced_adremover_merchandise_summary_off" />
         <SwitchPreference android:title="@string/revanced_adremover_browse_store_button_title" android:key="revanced_adremover_browse_store_button" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_browse_store_button_summary_on" android:summaryOff="@string/revanced_adremover_browse_store_button_summary_off" />
@@ -194,6 +176,9 @@
         <!-- SETTINGS: HIDE_PREV_BUTTON
         <SwitchPreference android:title="@string/revanced_hide_prev_button_title" android:key="revanced_hide_prev_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_prev_button_summary_on" android:summaryOff="@string/revanced_hide_prev_button_summary_off" />SETTINGS: HIDE_PREV_BUTTON -->
 
+        <!-- SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND
+        <SwitchPreference android:title="@string/revanced_hide_player_button_background_title" android:key="revanced_hide_player_button_background" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_button_background_summary_on" android:summaryOff="@string/revanced_hide_player_button_background_summary_off" />SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND -->
+
         <!-- SETTINGS: HIDE_ENDSCREEN_CARDS
         <SwitchPreference android:title="@string/revanced_hide_endscreen_cards_title" android:key="revanced_hide_endscreen_cards" android:defaultValue="true" android:summaryOn="@string/revanced_hide_endscreen_cards_summary_on" android:summaryOff="@string/revanced_hide_endscreen_cards_summary_off" />SETTINGS: HIDE_ENDSCREEN_CARDS -->
 
@@ -219,6 +204,9 @@
         <!-- SETTINGS: HIDE_FULLSCREEN_PANELS
         <SwitchPreference android:title="@string/revanced_hide_fullscreen_panels_title" android:key="revanced_hide_fullscreen_panels" android:defaultValue="true" android:summaryOn="@string/revanced_hide_fullscreen_panels_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_panels_summary_off" />SETTINGS: HIDE_FULLSCREEN_PANELS -->
 
+        <!-- SETTINGS: HIDE_FULLSCREEN_BUTTON_CONTAINER
+        <SwitchPreference android:title="@string/revanced_hide_fullscreen_button_container_title" android:key="revanced_hide_fullscreen_button_container" android:defaultValue="false" android:summaryOn="@string/revanced_hide_fullscreen_button_container_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_button_container_summary_off" />SETTINGS: HIDE_FULLSCREEN_BUTTON_CONTAINER -->
+
         <!-- SETTINGS: HIDE_ENDSCREEN_OVERLAY
         <SwitchPreference android:title="@string/revanced_hide_endscreen_overlay_title" android:key="revanced_hide_endscreen_overlay" android:defaultValue="false" android:summaryOn="@string/revanced_hide_endscreen_overlay_summary_on" android:summaryOff="@string/revanced_hide_endscreen_overlay_summary_off" />SETTINGS: HIDE_ENDSCREEN_OVERLAY -->
 
@@ -286,7 +274,7 @@
 
     <!-- SETTINGS: CUSTOM_SEEKBAR_COLOR
         <SwitchPreference android:title="@string/revanced_enable_custom_seekbar_color_title" android:key="revanced_enable_custom_seekbar_color" android:defaultValue="true" android:summaryOn="@string/revanced_enable_custom_seekbar_color_summary_on" android:summaryOff="@string/revanced_enable_custom_seekbar_color_summary_off" />
-        <EditTextPreference android:title="@string/revanced_custom_seekbar_color_value_title" android:key="revanced_custom_seekbar_color_value" android:summary="@string/revanced_custom_seekbar_color_value_summary" android:defaultValue="#ff0000" android:hint="#ff0000" android:inputType="text" />SETTINGS: CUSTOM_SEEKBAR_COLOR -->
+        <EditTextPreference android:title="@string/revanced_custom_seekbar_color_value_title" android:key="revanced_custom_seekbar_color_value" android:summary="@string/revanced_custom_seekbar_color_value_summary" android:defaultValue="#ff0000" android:hint="#ff0000" android:inputType="text" android:dependency="revanced_enable_custom_seekbar_color" />SETTINGS: CUSTOM_SEEKBAR_COLOR -->
 
     <!-- SETTINGS: ENABLE_SEEKBAR_TAPPING
         <SwitchPreference android:title="@string/revanced_enable_seekbar_tapping_title" android:key="revanced_enable_seekbar_tapping" android:defaultValue="true" android:summaryOn="@string/revanced_enable_seekbar_tapping_summary_on" android:summaryOff="@string/revanced_enable_seekbar_tapping_summary_off" />SETTINGS: ENABLE_SEEKBAR_TAPPING -->
@@ -301,6 +289,7 @@
     <!-- PREFERENCE: OVERLAY_BUTTONS
     <PreferenceScreen android:title="@string/revanced_overlay_button_title" android:key="overlaybutton" android:summary="@string/revanced_overlay_button_summary">
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button_title" />
+        <SwitchPreference android:title="@string/revanced_overlay_button_speed_title" android:key="revanced_overlay_button_speed" android:defaultValue="true" android:summaryOn="@string/revanced_overlay_button_speed_summary_on" android:summaryOff="@string/revanced_overlay_button_speed_summary_off" />
         <SwitchPreference android:title="@string/revanced_overlay_button_whitelist_title" android:key="revanced_overlay_button_whitelist" android:defaultValue="false" android:summaryOn="@string/revanced_overlay_button_whitelist_summary_on" android:summaryOff="@string/revanced_overlay_button_whitelist_summary_off" />
         <SwitchPreference android:title="@string/revanced_overlay_button_copy_url_title" android:key="revanced_overlay_button_copy_url" android:defaultValue="false" android:summaryOn="@string/revanced_overlay_button_copy_url_summary_on" android:summaryOff="@string/revanced_overlay_button_copy_url_summary_off" />
         <SwitchPreference android:title="@string/revanced_overlay_button_copy_url_with_timestamp_title" android:key="revanced_overlay_button_copy_url_with_timestamp" android:defaultValue="false" android:summaryOn="@string/revanced_overlay_button_copy_url_with_timestamp_summary_on" android:summaryOff="@string/revanced_overlay_button_copy_url_with_timestamp_summary_off" />
@@ -317,6 +306,30 @@
     </PreferenceScreen>PREFERENCE: OVERLAY_BUTTONS -->
 
 
+    <!-- PREFERENCE: VIDEO_SETTINGS
+    <PreferenceScreen android:title="@string/revanced_video_settings_title" android:key="video_settings" android:summary="@string/revanced_video_settings_summary">
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_settings_title" />PREFERENCE: VIDEO_SETTINGS -->
+
+        <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
+        <ListPreference android:title="@string/revanced_default_video_quality_wifi_title" android:key="revanced_default_video_quality_wifi" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />
+        <ListPreference android:title="@string/revanced_default_video_quality_mobile_title" android:key="revanced_default_video_quality_mobile" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
+
+        <!-- SETTINGS: DEFAULT_VIDEO_SPEED
+        <ListPreference android:title="@string/revanced_default_video_speed_title" android:key="revanced_default_video_speed" android:entries="@array/revanced_default_video_speed_entry" android:defaultValue="-2.0" android:entryValues="@array/revanced_default_video_speed_entry_value" />SETTINGS: DEFAULT_VIDEO_SPEED -->
+
+        <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
+        <SwitchPreference android:title="@string/revanced_enable_save_video_quality_title" android:key="revanced_enable_save_video_quality" android:defaultValue="false" android:summaryOn="@string/revanced_enable_save_video_quality_summary_on" android:summaryOff="@string/revanced_enable_save_video_quality_summary_off" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
+
+        <!-- SETTINGS: DEFAULT_VIDEO_SPEED
+        <SwitchPreference android:title="@string/revanced_enable_save_video_speed_title" android:key="revanced_enable_save_video_speed" android:defaultValue="false" android:summaryOn="@string/revanced_enable_save_video_speed_summary_on" android:summaryOff="@string/revanced_enable_save_video_speed_summary_off" />SETTINGS: DEFAULT_VIDEO_SPEED -->
+
+        <!-- SETTINGS: CUSTOM_VIDEO_SPEED
+        <SwitchPreference android:title="@string/revanced_enable_custom_video_speed_title" android:key="revanced_enable_custom_video_speed" android:defaultValue="false" android:summaryOn="@string/revanced_enable_custom_video_speed_summary_on" android:summaryOff="@string/revanced_enable_custom_video_speed_summary_off" />SETTINGS: CUSTOM_VIDEO_SPEED -->
+
+    <!-- PREFERENCE: VIDEO_SETTINGS
+    </PreferenceScreen>PREFERENCE: VIDEO_SETTINGS -->
+
+
     <PreferenceScreen android:title="@string/revanced_misc_settings_title" android:key="misc" android:summary="@string/revanced_misc_settings_summary">
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_misc_settings_title" />
 
@@ -329,8 +342,7 @@
         <!-- SETTINGS: ENABLE_MINIMIZED_PLAYBACK
         <SwitchPreference android:title="@string/revanced_enable_minimized_playback_title" android:key="revanced_enable_minimized_playback" android:defaultValue="true" android:summaryOn="@string/revanced_enable_minimized_playback_summary_on" android:summaryOff="@string/revanced_enable_minimized_playback_summary_off" />SETTINGS: ENABLE_MINIMIZED_PLAYBACK -->
 
-        <!-- SETTINGS: EXPERIMENTAL_FLAGS
+        <Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />
-        <Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />SETTINGS: EXPERIMENTAL_FLAGS -->
         <!-- SETTINGS: ENABLE_OLD_LAYOUT
         <SwitchPreference android:title="@string/revanced_enable_old_layout_title" android:key="revanced_enable_old_layout" android:defaultValue="false" android:summaryOn="@string/revanced_enable_old_layout_summary_on" android:summaryOff="@string/revanced_enable_old_layout_summary_off" />SETTINGS: ENABLE_OLD_LAYOUT -->
         <!-- SETTINGS: LAYOUT_SWITCH
@@ -338,6 +350,9 @@
         <SwitchPreference android:title="@string/revanced_enable_phone_layout_title" android:key="revanced_enable_phone_layout" android:summary="@string/revanced_enable_phone_layout_summary" android:defaultValue="false" />SETTINGS: LAYOUT_SWITCH -->
         <!-- SETTINGS: ENABLE_VP9_CODEC
         <SwitchPreference android:title="@string/revanced_enable_vp9_codec_title" android:key="revanced_enable_vp9_codec" android:defaultValue="false" android:summary="@string/revanced_enable_vp9_codec_summary" />SETTINGS: ENABLE_VP9_CODEC -->
+        <PreferenceScreen android:title="@string/revanced_backup_settings_title" android:key="backup" android:summary="@string/revanced_backup_settings_summary">
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_backup_settings_title" />
+        </PreferenceScreen>
 
         <Preference android:title=" " android:selectable="false" android:summary="@string/pref_about_category" />
         <PreferenceScreen android:title="@string/revanced_patches_information"  android:summary="@string/revanced_patches_information_summary" >
@@ -349,11 +364,6 @@
             <Preference android:title="hide-general-ads" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-video-ads" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
-            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_settings_title" />
-            <Preference android:title="default-video-quality" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="default-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="custom-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls_title" />
             <Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
@@ -371,6 +381,7 @@
             <Preference android:title="hide-crowdfunding-box" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-email-address" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-snackbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="hide-floating-microphone" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="header-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_player" />
@@ -379,6 +390,7 @@
             <Preference android:title="hide-captions-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-live-chat-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-next-prev-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="hide-player-button-background" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-endscreen-cards" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-info-cards" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-channel-watermark" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -387,6 +399,7 @@
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_fullscreen" />
             <Preference android:title="hide-fullscreen-panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="hide-fullscreen-buttoncontainer" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-endscreen-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-filmstrip-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="disable-haptic-feedback" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -407,6 +420,11 @@
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button_title" />
             <Preference android:title="overlay-buttons" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
+            <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video_settings_title" />
+            <Preference android:title="default-video-quality" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="default-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="custom-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_misc_settings_title" />
             <Preference android:title="enable-external-browser" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="enable-open-links-directly" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -423,7 +441,6 @@
             <Preference android:title="hide-pip-notification" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-tooltip-content" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="optimize-resource" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="remove-player-button-background" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="translations" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="labels" android:summary="@string/revanced_labels_default" android:selectable="false"/>
             <Preference android:title="icons" android:summary="@string/revanced_icons_default" android:selectable="false"/>