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

Unverified Commit a829adaa authored by uazo's avatar uazo Committed by GitHub
Browse files

[AUTO] Patches auto-rebase for master branch (#1539) 

[AUTO] Patches auto-rebase for master branch
parents d66d099b 87363f6d

build/patches/Add-AllowUserCertificates-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -725,6 +728,7 @@ public abstract class ChromeFeatureList {

@@ -726,6 +729,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

build/patches/Add-flag-to-disable-external-intent-requests.patch

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -83,7 +83,12 @@ found in the LICENSE file.

@@ -88,7 +88,12 @@ found in the LICENSE file.

         android:title="@string/settings_incognito_tab_lock_title"

         android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"

         android:persistent="false" />

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

+7 −7
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser 
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -74,6 +74,11 @@ found in the LICENSE file.

@@ -79,6 +79,11 @@ found in the LICENSE file.

         android:title="@string/open_external_links_incognito_title"

         android:summary="@string/open_external_links_incognito_summary"

         android:defaultValue="false" />
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
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

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

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

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

 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
@@ -132,7 +132,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";

@@ -153,6 +167,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -162,6 +176,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

             }

         }
@@ -154,7 +154,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(

@@ -359,6 +388,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -368,6 +397,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";
@@ -162,7 +162,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
 

     @Override

     public boolean onPreferenceChange(Preference preference, Object newValue) {

@@ -384,6 +414,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -410,6 +440,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

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

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

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

         return true;

     }

@@ -440,6 +477,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -466,6 +503,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

                             : R.string.text_off);

         }
@@ -190,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -5906,6 +5906,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

@@ -5870,6 +5870,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

         Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.

       </message>

build/patches/Add-setting-to-invert-tap-and-long-tap.patch

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";

     public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =

             "NotificationPermissionBottomSheet";

@@ -669,6 +671,8 @@ public abstract class ChromeFeatureList {

@@ -670,6 +672,8 @@ public abstract class ChromeFeatureList {

             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);

     public static final CachedFlag sMoveTopToolbarToBottom =

             newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -233,7 +233,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sPrivacyGuidePreloadAndroid =

             newCachedFlag(PRIVACY_GUIDE_PRELOAD_ANDROID, false);

     public static final CachedFlag sOptimizationGuidePushNotifications =

@@ -828,6 +832,7 @@ public abstract class ChromeFeatureList {

@@ -830,6 +834,7 @@ public abstract class ChromeFeatureList {

                     sTabWindowManagerIndexReassignmentActivityNotInAppTasks,

                     sTabWindowManagerReportIndicesMismatch,

                     sUseChimeAndroidSdk,

build/patches/Cromite-Branding--improve-settings-ui.patch

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja 
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -7,7 +7,7 @@

@@ -13,7 +13,7 @@ found in the LICENSE file.

         android:key="sync_promo"

         android:order="0"/>

     <PreferenceCategory
@@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j 
         android:order="1001"

         android:title="@string/prefs_section_account_and_google_services"/>

     <org.chromium.chrome.browser.sync.settings.SignInPreference

@@ -20,7 +20,7 @@

@@ -26,7 +26,7 @@ found in the LICENSE file.

         android:layout="@layout/account_management_account_row"

         android:title="@string/sync_category_title"/>

     <org.chromium.components.browser_ui.settings.ChromeBasePreference