Android xml overlay files are showing up for all platforms when running update_patches because they are unconditionally copied now. Some of them should be patches anyway so they were converted, but others should ideally be resource overlays. For now we'll add the resource overlays to the update patch ignore list
14 lines
952 B
Diff
14 lines
952 B
Diff
diff --git a/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml b/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml
|
|
index e8bcf5b539df6b7ffee48f238b0462cfc99ae12a..ab67d8a044ad0e91d2446143ec1b2b895d9dcc2c 100644
|
|
--- a/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml
|
|
+++ b/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml
|
|
@@ -8,7 +8,7 @@ found in the LICENSE file.
|
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
|
|
- <org.chromium.chrome.browser.safe_browsing.settings.RadioButtonGroupSafeBrowsingPreference
|
|
+ <org.chromium.chrome.browser.safe_browsing.settings.BraveRadioButtonGroupSafeBrowsingPreference
|
|
android:key="safe_browsing_radio_button_group"
|
|
android:selectable="false"
|
|
app:allowDividerAbove="false"
|