LisoUseInAIKyrios
c2a099d1f4
Merge remote-tracking branch 'upstream/dev' into feat/patcher_instruction_filters
# Conflicts:
# extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java
# extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
# extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
# extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
# extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
# extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
# extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
# extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/SearchViewController.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ExternalDownloaderPreference.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SkipSponsorButton.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
# extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/VideoQualityDialogButton.java
# patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt
# patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/Fingerprints.kt
# patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/HideUpgradeButtonPatch.kt
# patches/src/main/kotlin/app/revanced/patches/music/misc/settings/SettingsPatch.kt
# patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt