浏览代码

remove flag and keep only toggle
tell that the script has failed with errors
remove copy to temporary file
remove approach with XML overlays so that there are no exceptions thrown while inflating

Carmelo Messina 4 年之前
父节点
当前提交
8c16413839

+ 2 - 2
build/patches/add-support-for-ISupportHelpAndFeedback.patch

@@ -1,6 +1,6 @@
 From: uazo <uazo@users.noreply.github.com>
 Date: Mon, 17 May 2021 12:30:12 +0000
-Subject: Add support for ISupportHelpAndFeedback
+Subject: add-support-for-ISupportHelpAndFeedback.patch
 
 ---
  .../chrome/browser/settings/SettingsActivity.java      | 10 +++++++---
@@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
-@@ -163,4 +163,8 @@ public class SettingsUtils {
+@@ -171,4 +171,8 @@ public class SettingsUtils {
              StrictMode.setThreadPolicy(oldPolicy);
          }
      }

+ 15 - 7
build/patches/add-support-for-prefs-addon.patch

@@ -3,10 +3,10 @@ Date: Mon, 17 May 2021 12:28:11 +0000
 Subject: Add support for prefs addon
 
 ---
- .../chrome/browser/settings/MainSettings.java |  7 ++++
- chrome/android/proguard/main.flags            |  7 ++++
- .../browser_ui/settings/SettingsUtils.java    | 37 +++++++++++++++++++
- 3 files changed, 51 insertions(+)
+ .../chrome/browser/settings/MainSettings.java |  7 +++
+ chrome/android/proguard/main.flags            |  7 +++
+ .../browser_ui/settings/SettingsUtils.java    | 45 +++++++++++++++++++
+ 3 files changed, 59 insertions(+)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
@@ -60,7 +60,7 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
  /**
   * A helper class for Settings.
   */
-@@ -126,4 +132,35 @@ public class SettingsUtils {
+@@ -126,4 +132,43 @@ public class SettingsUtils {
          ImageView imageButton = (ImageView) button;
          return imageButton.getDrawable() == parentMenu.getOverflowIcon();
      }
@@ -73,10 +73,18 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
 +        for(int count=0; count < fields.length; count++) {
 +            String assetName = fields[count].getName();
 +            if (assetName.startsWith(name)) {
++                int resId = 0;
 +                try {
-+                    int resId = fields[count].getInt(null);
-+                    return SettingsUtils.inflatePreferencesFromResource(preferenceFragment, resId);
++                    resId = fields[count].getInt(null);
 +                } catch (IllegalAccessException e) {}
++
++                if (resId != 0) {
++                    try {
++                        return SettingsUtils.inflatePreferencesFromResource(preferenceFragment, resId);
++                    } catch (Throwable e) {
++                        Log.e("settingsutils", "Error inflating from resource", e);
++                    }
++                }
 +            }
 +        }
 +        return null;

文件差异内容过多而无法显示
+ 360 - 203
build/patches/experimental-user-scripts-support.patch


部分文件因为文件数量过多而无法显示