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

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

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

[AUTO] Patches auto-rebase for master branch
parents 24889bb5 0297b196

build/patches/Android-Toolbar-Scroll-Ablation-setting.patch

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ new file mode 100644 
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

@@ -73,6 +73,12 @@ found in the LICENSE file.

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

         android:key="disable_toolbar_swipeup"

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

build/patches/Customize-selection-popup.patch

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ new file mode 100644 
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

@@ -73,4 +73,28 @@ found in the LICENSE file.

@@ -79,4 +79,28 @@ found in the LICENSE file.

         android:key="disable_toolbar_swipeup"

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

build/patches/Disable-all-predictors-code.patch

+13 −13
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc 
diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc

--- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc

+++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc

@@ -15,7 +15,9 @@

@@ -16,7 +16,9 @@

 #include "base/task/task_traits.h"

 #include "base/task/thread_pool.h"

 #include "base/values.h"
@@ -354,7 +354,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc 
 #include "chrome/renderer/accessibility/phrase_segmentation/dependency_tree.h"

 #include "chrome/renderer/accessibility/phrase_segmentation/phrase_segmenter.h"

 #include "chrome/renderer/accessibility/phrase_segmentation/token_boundaries.h"

@@ -25,6 +27,7 @@

@@ -26,6 +28,7 @@

 

 namespace {
@@ -362,7 +362,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc 
 // Returns the dependency parser model for this renderer process.

 DependencyParserModel& GetDependencyParserModel_() {

   static base::NoDestructor<DependencyParserModel> instance;

@@ -37,6 +40,7 @@ std::vector<size_t> GetDependencyHeads(base::span<const std::string> input) {

@@ -38,6 +41,7 @@ std::vector<size_t> GetDependencyHeads(base::span<const std::string> input) {

              ? dependency_parser_model.GetDependencyHeads(input)

              : std::vector<size_t>();

 }
@@ -370,7 +370,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc 
 

 }  // namespace

 

@@ -148,10 +152,13 @@ void ReadAloudAppModel::PreprocessTextForSpeech(

@@ -149,10 +153,13 @@ void ReadAloudAppModel::PreprocessTextForSpeech(

   }

 }
@@ -384,7 +384,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc 
 void ReadAloudAppModel::CalculatePhrases(

     a11y::ReadAloudCurrentGranularity& granularity) {

   if (!features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {

@@ -208,19 +215,23 @@ void ReadAloudAppModel::CalculatePhrases(

@@ -209,19 +216,23 @@ void ReadAloudAppModel::CalculatePhrases(

       base::BindOnce(&ReadAloudAppModel::UpdatePhraseBoundaries,

                      weak_ptr_factory_.GetWeakPtr(), phrase_tokens));

 }
@@ -410,7 +410,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc 
   // Reset the phrase calculation flag, so that the next phrase calculation can

   // be scheduled, if needed.

   is_calculating_phrases = false;

@@ -282,6 +293,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector<std::string> tokens,

@@ -283,6 +294,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector<std::string> tokens,

     current_phrase_calculation_index_ = -1;

     LOG(WARNING) << "All phrases calculated!";

   }
@@ -432,7 +432,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h 
 #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"

 #include "ui/accessibility/ax_node_position.h"

 

@@ -86,8 +89,10 @@ class ReadAloudAppModel {

@@ -112,8 +115,10 @@ class ReadAloudAppModel {

                                bool is_docs,

                                const std::set<ui::AXNodeID>* current_nodes);
@@ -443,7 +443,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h 
 

   // Increments the processed_granularity_index_, updating ReadAloud's state of

   // the current granularity to refer to the next granularity. The current

@@ -241,9 +246,11 @@ class ReadAloudAppModel {

@@ -269,9 +274,11 @@ class ReadAloudAppModel {

   //      still needs to be read.

   bool NoValidTextRemainingInCurrentNode(bool is_pdf, bool is_docs) const;
@@ -455,7 +455,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h 
 

   // Once the phrase segmentation has completed for a given sentence, update the

   // granularity with the phrase boundaries, and calculate phrases for the next

@@ -305,7 +312,7 @@ class ReadAloudAppModel {

@@ -333,7 +340,7 @@ class ReadAloudAppModel {

 

   // Whether a phrase calculation for a sentence is currently underway. (We

   // do not initiate a second calculation before the first has completed.)
@@ -477,7 +477,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr 
 #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"

 #include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h"

 #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h"

@@ -1454,6 +1456,7 @@ void ReadAnythingAppController::OnConnected() {

@@ -1462,6 +1464,7 @@ void ReadAnythingAppController::OnConnected() {

   render_frame()->GetBrowserInterfaceBroker().GetInterface(

       std::move(page_handler_factory_receiver));
@@ -485,7 +485,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr 
   // Get the dependency parser model used by phrase-based highlighting.

   if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) {

     return;

@@ -1462,6 +1465,7 @@ void ReadAnythingAppController::OnConnected() {

@@ -1470,6 +1473,7 @@ void ReadAnythingAppController::OnConnected() {

   page_handler_->GetDependencyParserModel(

       base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,

                      weak_ptr_factory_.GetWeakPtr()));
@@ -493,7 +493,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr 
 }

 

 void ReadAnythingAppController::OnCopy() const {

@@ -1666,11 +1670,13 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {

@@ -1674,11 +1678,13 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {

 }

 

 void ReadAnythingAppController::PreprocessTextForSpeech() {
@@ -507,7 +507,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr 
 }

 

 void ReadAnythingAppController::MovePositionToNextGranularity() {

@@ -1848,14 +1854,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {

@@ -1856,14 +1862,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {

 

 void ReadAnythingAppController::UpdateDependencyParserModel(

     base::File model_file) {

build/patches/Move-navigation-bar-to-bottom.patch

+7 −7
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
 #include "chrome/browser/android/webapk/webapk_features.h"

 #include "chrome/browser/browser_features.h"

 #include "chrome/browser/flags/android/chrome_session_state.h"

@@ -295,6 +296,8 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -296,6 +297,8 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &kNavBarColorMatchesTabBackground,

     &kNewTabSearchEngineUrlAndroid,

     &kNewTabPageAndroidTriggerForPrerender2,
@@ -1873,7 +1873,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

@@ -414,6 +414,10 @@ public abstract class ChromeFeatureList {

@@ -415,6 +415,10 @@ public abstract class ChromeFeatureList {

     public static final String NEW_TAB_PAGE_ANDROID_TRIGGER_FOR_PRERENDER2 =

             "NewTabPageAndroidTriggerForPrerender2";

     public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
@@ -1884,7 +1884,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";

@@ -801,6 +805,10 @@ public abstract class ChromeFeatureList {

@@ -802,6 +806,10 @@ public abstract class ChromeFeatureList {

                     PRICE_INSIGHTS, /* defaultValue= */ false, /* defaultValueInTests= */ true);

     public static final CachedFlag sOptimizationGuidePushNotifications =

             newCachedFlag(OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, true);
@@ -1895,7 +1895,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);

@@ -956,6 +964,8 @@ public abstract class ChromeFeatureList {

@@ -957,6 +965,8 @@ public abstract class ChromeFeatureList {

                     sPriceChangeModule,

                     sPriceInsights,

                     sOptimizationGuidePushNotifications,
@@ -2926,7 +2926,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow 
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java

--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java

+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java

@@ -15,6 +15,7 @@ import org.chromium.components.browser_ui.widget.ClipDrawableProgressBar.Drawing

@@ -16,6 +16,7 @@ import org.chromium.components.browser_ui.widget.ClipDrawableProgressBar.Drawing

 import org.chromium.ui.modelutil.PropertyKey;

 import org.chromium.ui.modelutil.PropertyModel;

 import org.chromium.ui.resources.ResourceManager;
@@ -2934,7 +2934,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow 
 

 /** A SceneLayer to render the top toolbar. This is the "view" piece of the top toolbar overlay. */

 @JNINamespace("android")

@@ -40,6 +41,13 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {

@@ -41,6 +42,13 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {

     /** Push all information about the texture to native at once. */

     private void pushProperties(PropertyModel model) {

         if (mResourceManagerSupplier.get() == null) return;
@@ -2948,7 +2948,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow 
         TopToolbarSceneLayerJni.get()

                 .updateToolbarLayer(

                         mNativePtr,

@@ -50,7 +58,7 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {

@@ -51,7 +59,7 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {

                         model.get(TopToolbarOverlayProperties.URL_BAR_RESOURCE_ID),

                         model.get(TopToolbarOverlayProperties.URL_BAR_COLOR),

                         model.get(TopToolbarOverlayProperties.X_OFFSET),

build/patches/Restore-Search-Ready-Omnibox-flag.patch

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
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

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

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

     &kReadAloudIPHMenuButtonHighlightCCT,

     &kRecordSuppressionMetrics,

     &kReengagementNotification,
@@ -34,7 +34,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

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

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

     public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION =

             "MayLaunchUrlUsesSeparateStoragePartition";

     public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization";