Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8ce1b5f7 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for v137 (no changes)

parent 08ce2310

build/patches/Add-a-proxy-configuration-page.patch

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -100,6 +100,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";

     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";

build/patches/Add-custom-tab-intents-privacy-option.patch

+5 −5
Original line number Diff line number Diff line
@@ -192,10 +192,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
+import org.chromium.base.IntentUtils;

+import org.chromium.base.PackageManagerUtils;

+

 import androidx.annotation.Nullable;

 import androidx.preference.PreferenceCategory;

 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;

@@ -149,6 +158,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

 import org.chromium.base.shared_preferences.SharedPreferencesManager;

@@ -148,6 +157,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

                 startTag, endTag, new ChromeClickableSpan(context, onClickCallback));

     }
@@ -205,7 +205,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     @Override

     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {

         mPageTitle.set(getString(R.string.prefs_privacy_security));

@@ -380,6 +392,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -379,6 +391,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

                 new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));

     }
@@ -215,7 +215,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     @Override

     public boolean onPreferenceChange(Preference preference, Object newValue) {

         String key = preference.getKey();

@@ -400,6 +415,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -399,6 +414,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {

             UserPrefs.get(getProfile())

                     .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -247,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         }

         return true;

     }

@@ -432,6 +472,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -431,6 +471,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

                     UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));

         }

build/patches/Add-option-to-disable-snapshots.patch

+5 −5
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
 import org.chromium.base.supplier.ObservableSupplier;

 import org.chromium.base.supplier.ObservableSupplierImpl;

 import org.chromium.build.annotations.Nullable;

@@ -98,12 +99,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;

@@ -97,12 +98,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;

 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;

 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";

     private static final String PREF_PRELOAD_PAGES = "preload_pages";

     private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";

@@ -206,6 +221,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -205,6 +220,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

             }

         }
@@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);

         // Record the launch of PG from the S&P link-row entry point

         privacyGuidePreference.setOnPreferenceClickListener(

@@ -436,6 +466,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -435,6 +465,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

 

     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";

     public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -171,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
 

     @Override

     public boolean onPreferenceChange(Preference preference, Object newValue) {

@@ -482,6 +513,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -481,6 +512,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();

             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);

             sharedPreferencesEditor.apply();
@@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         }

         return true;

     }

@@ -532,6 +570,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -531,6 +569,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

                             : R.string.text_off);

         }

build/patches/Add-option-to-not-persist-tabs-across-sessions.patch

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
 import org.chromium.base.IntentUtils;

 import org.chromium.base.metrics.RecordHistogram;

 import org.chromium.base.metrics.RecordUserAction;

@@ -113,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -112,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     private final SharedPreferencesManager mSharedPreferencesManager =

             ChromeSharedPreferences.getInstance();
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

     @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";

     @VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection";

@@ -377,7 +382,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -376,7 +381,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     @Override

     public boolean onPreferenceChange(Preference preference, Object newValue) {

         String key = preference.getKey();
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
             UserPrefs.get(getProfile())

                     .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);

         } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {

@@ -437,6 +446,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -436,6 +445,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

                             getContext(), getProfile()));

         }

build/patches/Dictionary-suggestions-for-the-Omnibox.patch

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re 
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java

--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java

+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java

@@ -312,8 +312,17 @@ class LocationBarMediator

@@ -313,8 +313,17 @@ class LocationBarMediator

             if (!mUrlFocusedWithPastedText

                     && !shouldRetainOmniboxOnFocus

                     && mLocationBarLayout.shouldClearTextOnFocus()) {