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

Commit 860af6f6 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Browser: Rework patches to adapt with upstream changes

parent 4bf1a146
Loading
Loading
Loading
Loading
+14 −18
Original line number Diff line number Diff line
e-set-package-name.patch
e-set-app-name.patch
e-set-popular-sites.patch
e-enable-donottrack.patch
e-share-search-engine.patch
e-async-dns-disable.patch
e-set-search-engines.patch
e-set-informations.patch
e-disable-autofill.patch
e-rebrand-translations.patch
e-enable-custom-tabs-by-default.patch
e-Launcher-icon-updated.patch
e-enable-search-suggestion.patch
e-replaced-chrome-with-browser-in-strings-file.patch
e-remove-string-google-from-other-services.patch
e-help-and-feedback-url.patch
e-disable-touch-to-search.patch
e-replace-chrome-icon-with-browser.patch
0001-Browser-Change-app-and-package-name-to-browser.patch
0001-Browser-Use-our-custom-icon-instead-of-chromium.patch
0001-Browser-Rename-strings-to-browser.patch
0001-Browser-Point-to-our-default-popular-sites.patch
0001-Browser-Enable-do-not-track-by-default.patch
0001-Browser-Add-provider-to-share-default-search-engine.patch
0001-Browser-Disable-async-DNS-by-default-on-Android.patch
0001-Browser-Enable-custom-tabs-by-default.patch
0001-Browser-Enable-search-suggestion-by-default.patch
0001-Browser-Hide-and-disable-touch-to-search-option.patch
0001-Browser-Modify-default-search-engines.patch
0001-Revert-Bromite-auto-updater.patch
0001-Revert-Block-gateway-attacks-via-websockets.patch
0001-Revert-Disable-unified-autoplay-feature.patch
+14 −15
Original line number Diff line number Diff line
From baa3101381755a9a7a196c0483e4a7e42104d90d Mon Sep 17 00:00:00 2001
From 17bf90aaa75ab1d9143fd9cdc2701b6fb37f63ec Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:18:32 +0100
Subject: [PATCH] [PATCH] chrome: Share search engine
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: [PATCH] Browser: Add provider to share default search engine

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 chrome/android/java/AndroidManifest.xml       |  6 ++
 .../provider/SearchEngineProvider.java        | 79 +++++++++++++++++++
 chrome/android/java_sources.gni               |  2 +
 3 files changed, 87 insertions(+)
 chrome/android/java_sources.gni               |  1 +
 3 files changed, 86 insertions(+)
 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 e4845fe382a0..3e6931aef72c 100644
index acc04d8b6857a..fd8b42667c778 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1151,6 +1151,12 @@ by a child template that "extends" this file.
                   android:readPermission="android.permission.GLOBAL_SEARCH" />
@@ -1284,6 +1284,12 @@ by a child template that "extends" this file.
           tools:ignore="ExportedContentProvider">
       </provider>
 
+      <!-- Provider for search engine data. -->
@@ -30,7 +30,7 @@ index e4845fe382a0..3e6931aef72c 100644
       {% block extra_application_definitions_for_test %}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
new file mode 100644
index 000000000000..86b7d3fd1457
index 0000000000000..299562413fe05
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
@@ -0,0 +1,79 @@
@@ -114,15 +114,14 @@ index 000000000000..86b7d3fd1457
+    }
+}
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 01620861902e..74905035fffe 100644
index ff99735e85056..4450b96d0b8d0 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -51,3 +51,5 @@ if (enable_arcore) {
     "java/src/org/chromium/chrome/browser/vr/ArDelegateImpl.java",
   ]
@@ -63,3 +63,4 @@ if (enable_arcore) {
 }
+
 
 chrome_java_sources += userscripts_java_sources
+chrome_java_sources += [ "java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java" ]
-- 
2.17.1
2.25.1
+64 −0
Original line number Diff line number Diff line
From 951f672e7e7ff6d43a7c4a2e37fa5224c20c1312 Mon Sep 17 00:00:00 2001
From 9191f8e182bf92e882e9995e712960893f7a5b99 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 12:34:29 +0100
Subject: [PATCH] BUILD: Set package name of the browser to
 "foundation.e.browser"
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: [PATCH] Browser: Change app and package name to browser

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 chrome/android/BUILD.gn                             | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
 .../res_chromium_base/values/channel_constants.xml  | 10 +++++-----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index a489d1a3b1e4..f4d241a379d3 100644
index d440e71a0d886..0cb4718753fe7 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -34,16 +34,7 @@ import("java_sources.gni")
 import("static_initializers.gni")
 import("trichrome.gni")
@@ -44,16 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
   assert(current_toolchain != android_secondary_abi_toolchain)
 }
 
-_default_package = "org.chromium.chrome"
-if (android_channel != "default") {
@@ -24,14 +24,14 @@ index a489d1a3b1e4..f4d241a379d3 100644
-  # AndroidManifest and its upstream target's .AndroidManifest.expected file
-  # are as expected. Upstream targets having a "org.chromium.chrome" package
-  # name will cause the comparison to output many unnecessary differences.
-  # See https://source.chromium.org/chromium/chromium/src/+/master:chrome/android/java/README.md
-  # See https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/README.md
-  _default_package += "." + android_channel
-}
+_default_package = "foundation.e.browser"
 
 declare_args() {
   # Android package name to use when compiling the public chrome targets
@@ -55,7 +46,7 @@ declare_args() {
@@ -65,7 +56,7 @@ declare_args() {
   # for details.
   chrome_public_manifest_package = _default_package
 }
@@ -40,6 +40,25 @@ index a489d1a3b1e4..f4d241a379d3 100644
 
 chrome_public_jinja_variables =
     default_chrome_public_jinja_variables +
diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml b/chrome/android/java/res_chromium_base/values/channel_constants.xml
index 460cbd791f23b..5adce5db9d242 100644
--- a/chrome/android/java/res_chromium_base/values/channel_constants.xml
+++ b/chrome/android/java/res_chromium_base/values/channel_constants.xml
@@ -5,9 +5,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The application name displayed to the user. -->
-    <string name="app_name" translatable="false">Chromium</string>
-    <string name="bookmark_widget_title" translatable="false">Chromium bookmarks</string>
-    <string name="search_widget_title" translatable="false">Chromium search</string>
-    <string name="quick_action_search_widget_title" translatable="false">Chromium quick action search</string>
-    <string name="dino_widget_title" translatable="false">Chromium dino</string>
+    <string name="app_name" translatable="false">Browser</string>
+    <string name="bookmark_widget_title" translatable="false">Browser bookmarks</string>
+    <string name="search_widget_title" translatable="false">Browser search</string>
+    <string name="quick_action_search_widget_title" translatable="false">Browser quick action search</string>
+    <string name="dino_widget_title" translatable="false">Browser dino</string>
 </resources>
-- 
2.17.1
2.25.1
+8 −8
Original line number Diff line number Diff line
From f5f030cd86abc25ad8f53a7ce4ef308deda5ba78 Mon Sep 17 00:00:00 2001
From 26005fd02b8c03fc6ddd6c450ab766a522e6b53b Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:20:54 +0100
Subject: [PATCH] [PATCH] chrome_features: Use default DNS settings
Date: Fri, 26 Nov 2021 08:26:03 +0000
Subject: [PATCH] Browser: Disable async DNS by default on Android

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
@@ -9,18 +9,18 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 9f76e03a491b..d8dc824ff652 100644
index aac450f4fee76..49f2559598d00 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -85,7 +85,7 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
@@ -80,7 +80,7 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
 // Enables the built-in DNS resolver.
 const base::Feature kAsyncDns {
   "AsyncDns",
-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC)
-#if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_ANDROID)
+#if defined(OS_CHROMEOS) || defined(OS_MAC)
       base::FEATURE_ENABLED_BY_DEFAULT
 #else
       base::FEATURE_DISABLED_BY_DEFAULT
-- 
2.17.1
2.25.1
+11 −11
Original line number Diff line number Diff line
From 37fdad5af9959318e10cef89aeda832a02e309e5 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 1 Jun 2021 05:56:26 +0200
Subject: [PATCH] privacy_preferences: Enable custom tabs by default
From 2e1722f561cd6c96af515feb8ff9486990981496 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:37:37 +0000
Subject: [PATCH] Browser: Enable custom tabs by default

Signed-off-by: Aayush Gupta <theimpulson@e.email>
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 chrome/android/java/res/xml/privacy_preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
index 4707305f789d..ab730db7d006 100644
index f6f21411b6a69..a0e31a8f34380 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -51,7 +51,7 @@
@@ -64,7 +64,7 @@
         android:key="allow_custom_tab_intents"
         android:title="@string/allow_custom_tab_intents_title"
         android:summary="@string/allow_custom_tab_intents_summary"
-        android:defaultValue="false" />
+        android:defaultValue="true" />
     <Preference
         android:key="privacy_sandbox"
         android:title="@string/prefs_privacy_sandbox"
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="open_external_links_incognito"
         android:title="@string/open_external_links_incognito_title"
-- 
2.17.1
2.25.1
Loading