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

Commit 7a3d26df authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Browser: Adapt patches for upstream changes 



Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent c6a371a9

bromite @ 5b6a7442

Original line number Diff line number Diff line 
Subproject commit fb5839d5ebb91408fcea203a3d9dca98074d088e
 
Subproject commit 5b6a7442e0c41d682efd0670755240f08563225a

build/patches/0001-Browser-Add-provider-to-share-default-search-engine.patch

+5 −5
Original line number Diff line number Diff line 
From 0378fc8c8bbb272aae00228baa5ab5a1b0a251cc Mon Sep 17 00:00:00 2001

From 013fbab37c4c5288cf0163bb3f88de0a58e06211 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 08:03:13 +0000

Subject: [PATCH] Browser: Add provider to share default search engine
@@ -12,11 +12,11 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email> 
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java



diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index 0a551fa3a9355..970b3c15b3032 100644

index e2cf845e088ff..fdea2d7c83b21 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -1291,6 +1291,12 @@ by a child template that "extends" this file.

           tools:ignore="ExportedContentProvider">

@@ -1276,6 +1276,12 @@ by a child template that "extends" this file.

                   android:readPermission="android.permission.GLOBAL_SEARCH" />

       </provider>

 

+      <!-- Provider for search engine data. -->
@@ -114,7 +114,7 @@ index 0000000000000..299562413fe05 
+    }

+}

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni

index bfb9dcf529f47..89c23938b600d 100644

index c4e4b7360ecd2..697a0e4ef4ad3 100644

--- a/chrome/android/java_sources.gni

+++ b/chrome/android/java_sources.gni

@@ -62,3 +62,4 @@ if (enable_arcore) {

build/patches/0001-Browser-Hide-and-disable-touch-to-search-option.patch

+9 −9
Original line number Diff line number Diff line 
From dcc6519ff3ee725852c328ba9e4eccfdd5b09a46 Mon Sep 17 00:00:00 2001

From 53a12891438279dd934039596fdc4c6e43632f17 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <aayushgupta219@gmail.com>

Date: Mon, 29 Nov 2021 03:54:44 +0000

Subject: [PATCH] Browser: Hide and disable touch to search option
@@ -10,10 +10,10 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com> 
 2 files changed, 4 insertions(+), 2 deletions(-)



diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

index e97fc3ceb1a1d..c7d994cdf2186 100644

index 881077bbeb57c..6c0775a58c758 100644

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

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

@@ -87,7 +87,8 @@

@@ -92,7 +92,8 @@

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

           android:key="contextual_search"

           android:title="@string/contextual_search_title"
@@ -24,20 +24,20 @@ index e97fc3ceb1a1d..c7d994cdf2186 100644 
 

 </PreferenceScreen>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java

index cbf437162aa4e..88d12b734fa71 100644

index 27f7461a76ad7..58c41debb8450 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java

@@ -39,8 +39,9 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat

         ChromeSwitchPreference contextualSearchSwitch =

                 (ChromeSwitchPreference) findPreference(PREF_CONTEXTUAL_SEARCH_SWITCH);

@@ -44,8 +44,9 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat

         ChromeSwitchPreference seeBetterResultsSwitch =

                 (ChromeSwitchPreference) findPreference(PREF_WAS_FULLY_ENABLED_SWITCH);

 

-        boolean isContextualSearchEnabled = !ContextualSearchManager.isContextualSearchDisabled();

-        boolean isContextualSearchEnabled = !ContextualSearchPolicy.isContextualSearchDisabled();

+        boolean isContextualSearchEnabled = false;

         contextualSearchSwitch.setChecked(isContextualSearchEnabled);

+        contextualSearchSwitch.setEnabled(isContextualSearchEnabled);

 

         contextualSearchSwitch.setOnPreferenceChangeListener((preference, newValue) -> {

             ContextualSearchManager.setContextualSearchState((boolean) newValue);

             ContextualSearchPolicy.setContextualSearchState((boolean) newValue);

-- 

2.25.1