PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
uazo
2024-10-09 03:43:35 -12:00
committed by GitHub
parent d66d099bbe 87363f6d7e
commit a829adaa5e
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Add-AllowUserCertificates-flag.patch
+1 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
build/patches/Enable-Global-Privacy-Control.patch
+2 -2
View File
@@ -156,7 +156,7 @@ new file mode 100644
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
@@ -89,6 +89,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -98,6 +98,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private static final String PREF_SECURE_DNS = "secure_dns";
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
private static final String PREF_DO_NOT_TRACK = "do_not_track";
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_SAFE_BROWSING = "safe_browsing";
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
private static final String PREF_REFERER_POLICY = "referers_policy";
@@ -461,6 +462,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -487,6 +488,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
: R.string.text_off);
}
build/patches/Enable-ImprovedBookmarks-by-default.patch
+1 -1
View File
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -862,7 +862,7 @@ public abstract class ChromeFeatureList {
@@ -864,7 +864,7 @@ public abstract class ChromeFeatureList {
public static final MutableFlagWithSafeDefault sAdaptiveButtonInTopToolbarCustomizationV2 =
newMutableFlagWithSafeDefault(ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2, false);
public static final MutableFlagWithSafeDefault sAndroidImprovedBookmarks =
build/patches/History-number-of-days-privacy-setting.patch
+5 -5
View File
@@ -38,7 +38,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
@@ -128,6 +128,12 @@ found in the LICENSE file.
@@ -133,6 +133,12 @@ found in the LICENSE file.
android:title="@string/cablev2_paask_title"
android:summary="@string/cablev2_paask_body"
android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment" />
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
import org.chromium.components.browser_ui.site_settings.SingleCategorySettings;
import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
@@ -61,6 +62,9 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
@@ -70,6 +71,9 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
/** Fragment to keep track of the all the privacy related preferences. */
public class PrivacySettings extends ChromeBaseSettingsFragment
implements Preference.OnPreferenceChangeListener {
@@ -102,6 +106,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -111,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private ChromeSwitchPreference allowCustomTabIntentsPref;
private ChromeSwitchPreference openExternalLinksPref;
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.prefs_privacy_security);
@@ -232,6 +238,40 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -241,6 +247,40 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
syncAndServicesLink.setSummary(buildFooterString());
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
Preference thirdPartyCookies = findPreference(PREF_THIRD_PARTY_COOKIES);
Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
@@ -470,6 +510,29 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -496,6 +536,29 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
&& ChromeFeatureList.isEnabled(ChromeFeatureList.FINGERPRINTING_PROTECTION_SETTING);
}
build/patches/Move-navigation-bar-to-bottom.patch
+2 -2
View File
@@ -1932,7 +1932,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";
@@ -660,6 +664,10 @@ public abstract class ChromeFeatureList {
@@ -661,6 +665,10 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sPriceInsights = newCachedFlag(PRICE_INSIGHTS, false);
public static final CachedFlag sPrivacyGuideAndroid3 =
newCachedFlag(PRIVACY_GUIDE_ANDROID_3, false);
@@ -1943,7 +1943,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 =
@@ -788,6 +796,8 @@ public abstract class ChromeFeatureList {
@@ -790,6 +798,8 @@ public abstract class ChromeFeatureList {
sPrivacyGuideAndroid3,
sPrivacyGuidePreloadAndroid,
sOptimizationGuidePushNotifications,
build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
+3 -3
View File
@@ -120,7 +120,7 @@ new file mode 100644
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
@@ -116,6 +116,10 @@ found in the LICENSE file.
@@ -121,6 +121,10 @@ found in the LICENSE file.
android:title="@string/close_tabs_on_exit_title"
android:summary="@string/close_tabs_on_exit_summary"
android:defaultValue="false" />
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings;
import org.chromium.chrome.browser.privacy_guide.PrivacyGuideInteractions;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge;
@@ -76,6 +77,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -85,6 +86,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_SAFE_BROWSING = "safe_browsing";
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
private static final String PREF_PROXY_OPTIONS = "proxy";
private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
@@ -438,6 +440,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -464,6 +466,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
: R.string.text_off);
}
build/patches/Use-list-mode-for-tab-switcher.patch
+1 -1
View File
@@ -42,7 +42,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
@@ -95,6 +95,12 @@ found in the LICENSE file.
@@ -100,6 +100,12 @@ found in the LICENSE file.
android:summary="@string/allow_external_intent_requests_summary"
app:featureName="AllowExternalIntentRequests"
app:needRestart="false" />