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

Commit 488fab29 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Update e patches

parent 252bea76
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
From abaa31c9ecfce49d7021638c57cfe683cc9c9b5d Mon Sep 17 00:00:00 2001
From 999a54d8ca4a591df0d0cedfb4b7bc5f78157611 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Wed, 16 Nov 2022 11:14:01 +0000
Subject: Add Mojeek Search engine
@@ -8,7 +8,7 @@ Subject: Add Mojeek Search engine
 1 file changed, 1 insertion(+)

diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
index 8ecad995b90d0..99c4a44594b9f 100644
index 38964682da20f..ae5b4298d910e 100644
--- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc
@@ -42,6 +42,7 @@ constexpr EngineAndTier engines_default[] = {
@@ -20,5 +20,5 @@ index 8ecad995b90d0..99c4a44594b9f 100644
 
 // Note, the below entries are sorted by country code, not the name in comment.
-- 
2.34.1
2.47.1
+6 −6
Original line number Diff line number Diff line
From 35bdc9fcf99aba8e2a2cabeb2294fb428863dbbf Mon Sep 17 00:00:00 2001
From 2153c5dec892c6ce34fbe04cb9fe573263702536 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: 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 56722435b85b6..c54925669a2cb 100644
index 65808866ca8d5..a38c08abb8024 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1307,6 +1307,12 @@ by a child template that "extends" this file.
@@ -1295,6 +1295,12 @@ by a child template that "extends" this file.
                   android:readPermission="android.permission.GLOBAL_SEARCH" />
       </provider>
 
@@ -114,14 +114,14 @@ index 0000000000000..299562413fe05
+    }
+}
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 521766b03475d..27d1b36501aa9 100644
index 8b061b9741a97..185f08c123009 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -60,3 +60,4 @@ if (enable_cardboard) {
@@ -58,3 +58,4 @@ if (enable_cardboard) {
 }
 
 chrome_java_sources += userscripts_java_sources
+chrome_java_sources += [ "java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java" ]
-- 
2.34.1
2.47.1
+6 −6
Original line number Diff line number Diff line
From 150b423fdfd46f56e6d343398699388519ee71ff Mon Sep 17 00:00:00 2001
From ae032864beffec0ab7053634a69a074e5e8912b2 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Tue, 10 Sep 2024 12:17:23 +0530
Subject: Browser: Change adblock url to ours
@@ -43,10 +43,10 @@ index ef6d1652c97f0..24cd56084827d 100644
         mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL());
         mAdBlockFiltersUrlEdit.addTextChangedListener(this);
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 00940048a3211..d2c8dca7e2da9 100644
index aeacb35386f12..ff6a4e0be5533 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1238,11 +1238,11 @@ BrowserProcessImpl::adblock_updater() {
@@ -1239,11 +1239,11 @@ BrowserProcessImpl::adblock_updater() {
   std::unique_ptr<component_updater::UpdateScheduler> scheduler =
       std::make_unique<component_updater::TimerUpdateScheduler>();
 
@@ -63,7 +63,7 @@ index 00940048a3211..d2c8dca7e2da9 100644
   }
 
   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
@@ -1250,7 +1250,7 @@ BrowserProcessImpl::adblock_updater() {
@@ -1251,7 +1251,7 @@ BrowserProcessImpl::adblock_updater() {
           std::move(scheduler),
           g_browser_process->subresource_filter_ruleset_service(),
           local_state()->GetBoolean(prefs::kAdBlockEnabled),
@@ -73,7 +73,7 @@ index 00940048a3211..d2c8dca7e2da9 100644
   return adblock_updater_.get();
 }
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
index 92c95c2797f83..97e2f577818f3 100644
index cfc3e3fd63558..2afa1e270bd43 100644
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -642,7 +642,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -86,5 +86,5 @@ index 92c95c2797f83..97e2f577818f3 100644
   // Static auth params
   registry->RegisterStringPref(prefs::kAuthSchemes,
-- 
2.34.1
2.47.1
+2 −2
Original line number Diff line number Diff line
From b48001e6f04d453f3bd5764e9032e802a33ca8b5 Mon Sep 17 00:00:00 2001
From 77dd135feedab18aafe90396155d41dcf5adf490 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: Browser: Change app and package name to browser
@@ -27,5 +27,5 @@ index cc1f2a30cb3c5..49863cede1033 100644
+    <string name="quick_action_search_widget_title" translatable="false">Browser quick action search</string>
 </resources>
-- 
2.34.1
2.47.1
+2 −2
Original line number Diff line number Diff line
From 0ba75217686c820795a08e180ccee8ffb505d1e1 Mon Sep 17 00:00:00 2001
From e1033025e432452931661cc459f225e3021b51f4 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 14 Dec 2022 16:17:58 +0530
Subject: Browser: Change info bar icon
@@ -496,5 +496,5 @@ zO+Z*7&Bk!eoH~L?=|dPuV(*)KA768Q5Fa%#552smrlzK*rlzK*rlw|+-vB>p(BZ;*
R_znO7002ovPDHLkV1oYj%jf_A

-- 
2.34.1
2.47.1
Loading