From 200c855c3ec4700e0cc92143e8a32e12ec22a360 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 8 Nov 2020 02:09:41 +0100 Subject: [PATCH] Fix missing index lines Fix patch order --- build/bromite_patches_list.txt | 1 + ...oval-of-an-option-to-block-autoplay.patch} | 53 +++++++++++-------- 2 files changed, 33 insertions(+), 21 deletions(-) rename build/patches/{Revert-removal-option-to-block-autoplay.patch => Revert-the-removal-of-an-option-to-block-autoplay.patch} (95%) diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 529eee12..c1d5d08d 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -152,3 +152,4 @@ Move-some-account-settings-back-to-privacy-settings.patch Add-a-flag-to-always-view-desktop-site-for-all-websites.patch Revert-removal-option-to-block-autoplay.patch Automated-domain-substitution.patch +Revert-the-removal-of-an-option-to-block-autoplay.patch diff --git a/build/patches/Revert-removal-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch similarity index 95% rename from build/patches/Revert-removal-option-to-block-autoplay.patch rename to build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index f1b0a374..142c7c57 100644 --- a/build/patches/Revert-removal-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -37,16 +37,16 @@ Subject: Revert the removal of an option to block autoplay .../core/html/media/autoplay_policy.cc | 12 +++++++++++- .../core/html/media/autoplay_policy.h | 4 ++++ 33 files changed, 131 insertions(+), 4 deletions(-) - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_media.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_autoplay.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_media.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_media.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-xxhdpi/settings_autoplay.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-xxhdpi/settings_media.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-xxxhdpi/settings_autoplay.png - create mode 100755 components/browser_ui/site_settings/android/java/res/drawable-xxxhdpi/settings_media.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_media.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_autoplay.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_media.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_media.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xxhdpi/settings_autoplay.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xxhdpi/settings_media.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xxxhdpi/settings_autoplay.png + create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xxxhdpi/settings_media.png diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn @@ -69,7 +69,8 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable/settings_bluetooth.xml", "java/res/layout/add_site_dialog.xml", diff --git a/components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png b/components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png -new file mode 100755 +new file mode 100644 +index 0000000000000000000000000000000000000000..a8a9265f14cd8445ad1f55845099e60dc3c4edf1 GIT binary patch literal 456 zcmV;(0XP1MP) @@ -86,7 +87,8 @@ literal 0 HcmV?d00001 diff --git a/components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_media.png b/components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_media.png -new file mode 100755 +new file mode 100644 +index 0000000000000000000000000000000000000000..aafa655ac842373e74c4b9b9766fe84e9a9868a8 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8x2KC^NX4zU=MHi<81S$L=i{Fh)C @@ -123,7 +127,8 @@ literal 0 HcmV?d00001 diff --git a/components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png b/components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png -new file mode 100755 +new file mode 100644 +index 0000000000000000000000000000000000000000..5a4128a5e02949de754f9cab2635824eda8c539c GIT binary patch literal 551 zcmV+?0@(eDP)o-5W`$0 @@ -155,7 +161,8 @@ literal 0 HcmV?d00001 diff --git a/components/browser_ui/site_settings/android/java/res/drawable-xxhdpi/settings_autoplay.png b/components/browser_ui/site_settings/android/java/res/drawable-xxhdpi/settings_autoplay.png -new file mode 100755 +new file mode 100644 +index 0000000000000000000000000000000000000000..7fceb8c2b546970a3720e8ab225799aa03895b7f GIT binary patch literal 792 zcmV+z1LypSP)