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

Commit 924f1d28 authored by uazo's avatar uazo Committed by github-actions[bot]
Browse files

[AUTO] Patches auto-rebase

parent 54e55452

build/patches/Add-AllowUserCertificates-flag.patch

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

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -642,6 +643,8 @@ public abstract class ChromeFeatureList {

@@ -643,6 +644,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidMinimalUiLargeScreen =

             newCachedFlag(ANDROID_MINIMAL_UI_LARGE_SCREEN, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -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, true);

     public static final CachedFlag sAsyncNotificationManagerForDownload =

@@ -877,6 +880,7 @@ public abstract class ChromeFeatureList {

@@ -878,6 +881,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAndroidAppIntegration,

build/patches/Add-bookmark-import-export-actions.patch

+1 −1
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
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

@@ -598,6 +598,7 @@ public abstract class ChromeFeatureList {

@@ -599,6 +599,7 @@ public abstract class ChromeFeatureList {

     public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =

             "UseLibunwindstackNativeUnwinderAndroid";

     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";

build/patches/Add-cromite-flags-support.patch

+4 −4
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -1202,5 +1202,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,

@@ -1207,5 +1207,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,

              "WebOtpCrossDeviceSimpleString",

              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -736,7 +736,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

--- a/chrome/browser/flags/android/chrome_feature_list.h

+++ b/chrome/browser/flags/android/chrome_feature_list.h

@@ -240,6 +240,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(

@@ -241,6 +241,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(

     "trigger_id",

     /*default_value=*/"");
@@ -758,7 +758,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
 import java.util.List;

 import java.util.Map;

 

@@ -862,7 +866,7 @@ public abstract class ChromeFeatureList {

@@ -863,7 +867,7 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sWebApkMinShellApkVersion =

             newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
@@ -767,7 +767,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
             List.of(

                     sAndroidAppIntegration,

                     sAndroidAppIntegrationModule,

@@ -967,6 +971,13 @@ public abstract class ChromeFeatureList {

@@ -968,6 +972,13 @@ public abstract class ChromeFeatureList {

                     sUseLibunwindstackNativeUnwinderAndroid,

                     sWebApkMinShellApkVersion);

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

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
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

@@ -766,6 +766,8 @@ public abstract class ChromeFeatureList {

@@ -767,6 +767,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true);

     public static final CachedFlag sMostVisitedTilesCustomization =

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

             newCachedFlag(MOST_VISITED_TILES_RESELECT, false);

     public static final CachedFlag sMultiInstanceApplicationStatusCleanup =

@@ -932,6 +934,7 @@ public abstract class ChromeFeatureList {

@@ -933,6 +935,7 @@ public abstract class ChromeFeatureList {

                     sNotificationTrampoline,

                     sMagicStackAndroid,

                     sMostVisitedTilesCustomization,

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

+4 −4
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -343,6 +343,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -344,6 +344,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &kTabGroupParityBottomSheetAndroid,

     &kToolbarPhoneCleanup,

     &kTabResumptionModuleAndroid,
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
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

@@ -418,6 +418,8 @@ public abstract class ChromeFeatureList {

@@ -419,6 +419,8 @@ public abstract class ChromeFeatureList {

             "DisableToolbarSwipeUp";

     public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =

             "MoveTopToolbarToBottom";
@@ -188,7 +188,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";

@@ -809,6 +811,8 @@ public abstract class ChromeFeatureList {

@@ -810,6 +812,8 @@ public abstract class ChromeFeatureList {

             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);

     public static final CachedFlag sMoveTopToolbarToBottom =

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

     public static final CachedFlag sPostGetMyMemoryStateToBackground =

             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);

@@ -993,6 +997,7 @@ public abstract class ChromeFeatureList {

@@ -994,6 +998,7 @@ public abstract class ChromeFeatureList {

                     sTabWindowManagerReportIndicesMismatch,

                     sTraceBinderIpc,

                     sUseChimeAndroidSdk,