Commit dd45eb20 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Browser: Import bromite's v94.0.4606.109 release


Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent 860af6f6
bromite @ fb5839d5
Subproject commit 19bcbb3055cac8a8a778f89a8ea4123c6b4aea79
Subproject commit fb5839d5ebb91408fcea203a3d9dca98074d088e
From 17bf90aaa75ab1d9143fd9cdc2701b6fb37f63ec Mon Sep 17 00:00:00 2001
From 0378fc8c8bbb272aae00228baa5ab5a1b0a251cc 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,10 +12,10 @@ 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 acc04d8b6857a..fd8b42667c778 100644
index 0a551fa3a9355..970b3c15b3032 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1284,6 +1284,12 @@ by a child template that "extends" this file.
@@ -1291,6 +1291,12 @@ by a child template that "extends" this file.
tools:ignore="ExportedContentProvider">
</provider>
......@@ -114,10 +114,10 @@ index 0000000000000..299562413fe05
+ }
+}
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index ff99735e85056..4450b96d0b8d0 100644
index bfb9dcf529f47..89c23938b600d 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -63,3 +63,4 @@ if (enable_arcore) {
@@ -62,3 +62,4 @@ if (enable_arcore) {
}
chrome_java_sources += userscripts_java_sources
......
From 122f22149c1b037c5b3481aaf3a2fbcc4d606858 Mon Sep 17 00:00:00 2001
From dcc6519ff3ee725852c328ba9e4eccfdd5b09a46 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 a0e31a8f34380..42d14f1980b10 100644
index e97fc3ceb1a1d..c7d994cdf2186 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -91,7 +91,8 @@
@@ -87,7 +87,8 @@
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="contextual_search"
android:title="@string/contextual_search_title"
......@@ -24,20 +24,20 @@ index a0e31a8f34380..42d14f1980b10 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 27f7461a76ad7..58c41debb8450 100644
index cbf437162aa4e..88d12b734fa71 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
@@ -44,8 +44,9 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat
ChromeSwitchPreference seeBetterResultsSwitch =
(ChromeSwitchPreference) findPreference(PREF_WAS_FULLY_ENABLED_SWITCH);
@@ -39,8 +39,9 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat
ChromeSwitchPreference contextualSearchSwitch =
(ChromeSwitchPreference) findPreference(PREF_CONTEXTUAL_SEARCH_SWITCH);
- boolean isContextualSearchEnabled = !ContextualSearchPolicy.isContextualSearchDisabled();
- boolean isContextualSearchEnabled = !ContextualSearchManager.isContextualSearchDisabled();
+ boolean isContextualSearchEnabled = false;
contextualSearchSwitch.setChecked(isContextualSearchEnabled);
+ contextualSearchSwitch.setEnabled(isContextualSearchEnabled);
contextualSearchSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
ContextualSearchPolicy.setContextualSearchState((boolean) newValue);
ContextualSearchManager.setContextualSearchState((boolean) newValue);
--
2.25.1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment