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

Commit c80748d3 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

[Auto] Update e patches

parent 66d02e8b

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

+3 −3
Original line number Diff line number Diff line 
From 0d2eb25a97bf7126a93076463830f35931091ef0 Mon Sep 17 00:00:00 2001

From 65aa3e9c36d7b03f60712ce197c378a65bd99b7a 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
@@ -13,10 +13,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 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 631a4d39eec07..e9c9e7c1a5890 100644

index 9bf9ee21f527b..f6f6f9fce1ab9 100644

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

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

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

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

           tools:ignore="ExportedContentProvider">

       </provider>

build/e_patches/Handle-web-search-action-in-browser.patch

+3 −3
Original line number Diff line number Diff line 
From ecd3589b7cf611a891184f461917d29df29c8d6b Mon Sep 17 00:00:00 2001

From c6d4d208197a153fdcb99ca16aeead3071afcd48 Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Wed, 28 Sep 2022 05:37:00 +0200

Subject: Handle web search action in browser
@@ -32,10 +32,10 @@ index 56b1dcd70350e..71e7516db5b98 100644 
     public static boolean hasSystemFeature(String feature) {

         PackageManager pm = ContextUtils.getApplicationContext().getPackageManager();

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

index e9c9e7c1a5890..0a2954d01ad35 100644

index f6f6f9fce1ab9..d20a6a1aff7bc 100644

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

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

@@ -371,6 +371,10 @@ by a child template that "extends" this file.

@@ -364,6 +364,10 @@ by a child template that "extends" this file.

             <intent-filter>

                 <action android:name="android.intent.action.SEARCH" />

             </intent-filter>

build/e_patches/Update-i18n-zhCN-support.patch

+6 −6
Original line number Diff line number Diff line 
From ec37187f11009cd98887154f218b40e2891090f7 Mon Sep 17 00:00:00 2001

From 614c7c9b7d1da41e6d2805e033ea9b049629465b Mon Sep 17 00:00:00 2001

From: mars <gzhqyz@gmail.com>

Date: Sun, 2 Aug 2020 00:37:49 +0800

Subject: Update i18n zh_CN support
@@ -15,7 +15,7 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 6 files changed, 132 insertions(+), 6 deletions(-)



diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb

index 10b33bc044183..a07d870772e5c 100644

index 5045c9d4879ec..5f627daf14b90 100644

--- a/chrome/app/resources/generated_resources_zh-CN.xtb

+++ b/chrome/app/resources/generated_resources_zh-CN.xtb

@@ -12186,4 +12186,6 @@
@@ -28,7 +28,7 @@ index 10b33bc044183..a07d870772e5c 100644 
+<translation id="6262611605884902060">配置广告拦截和过滤规则地址</translation>

+</translationbundle>

diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb

index af6bdaba0292f..a2b057d57ea1b 100644

index c3b081f3e2278..89befb5317464 100644

--- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb

+++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb

@@ -778,4 +778,5 @@
@@ -40,7 +40,7 @@ index af6bdaba0292f..a2b057d57ea1b 100644 
+<translation id="9090881409075599658">关于 Bromite</translation>

+</translationbundle>

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

index db125f3cc5811..2aa644f8eeaa7 100644

index 832c9a50a514b..4267f70006cdc 100644

--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

@@ -1999,4 +1999,73 @@
@@ -120,7 +120,7 @@ index db125f3cc5811..2aa644f8eeaa7 100644 
+<translation id="6792382002445853728">移动工具栏到底部</translation>

+</translationbundle>

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

index c8bf8be048adc..51ab373fa0349 100644

index 9f2d2ffc932cf..3bd981f51a3c4 100644

--- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

@@ -762,4 +762,28 @@
@@ -155,7 +155,7 @@ index c8bf8be048adc..51ab373fa0349 100644 
+<translation id="8431607486333903291">WebRTC</translation>

+</translationbundle>

diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb

index a6fbe56f83071..6497ff111eec5 100644

index d5e3cd00aea62..7ff8a4287fab2 100644

--- a/components/strings/components_strings_zh-CN.xtb

+++ b/components/strings/components_strings_zh-CN.xtb

@@ -5194,4 +5194,33 @@