Resolve patches that are causing conflicts

From 955b40fb3e13391d88d5a3f6de0562851b00e83c Mon Sep 17 00:00:00 2001

From 524b64d8be2879bff10af9cc8a4d5c6cb68ebe40 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 07:12:30 +0000

Subject: Browser: Rename strings to browser

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../android/java/res/xml/about_chrome_preferences.xml  |  3 +++

 .../browser/about_settings/AboutChromeSettings.java    |  6 +++---

 .../browser/about_settings/AboutChromeSettings.java    |  9 +++------

 .../ui/android/strings/android_chrome_strings.grd      |  2 ++

 chrome/browser/ui/android/strings/foundation_e.grdp    | 10 ++++++++++

 4 files changed, 18 insertions(+), 3 deletions(-)

 4 files changed, 18 insertions(+), 6 deletions(-)

 create mode 100644 chrome/browser/ui/android/strings/foundation_e.grdp

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

         android:key="application_version"

         android:title="@string/application_version_title" />

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java

index b4db43786e475..6930f0e13e00c 100644

index 3e4f90d0d0c4d..c6ea3612cc83e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java

@@ -43,7 +43,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

     // Non-translated strings:

     @SuppressWarnings("InlineFormatString")

@@ -74,10 +74,10 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

@@ -74,12 +74,9 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

         p = findPreference(PREF_OS_VERSION);

         assumeNonNull(p);

         p.setSummary(AboutSettingsBridge.getOSVersion());

-        p = findPreference(PREF_LEGAL_INFORMATION);

+        p = findPreference(PREF_E_BROWSER_INFORMATION);

         assumeNonNull(p);

         int currentYear = CalendarFactory.get().get(Calendar.YEAR);

-        Calendar calendar = CalendarFactory.get();

-        calendar.setTimeInMillis(System.currentTimeMillis());

-        int currentYear = calendar.get(Calendar.YEAR);

-        p.setSummary(getString(R.string.legal_information_summary, currentYear));

+        p.setSummary(getString(R.string.e_browser_information));

     }

     @Override

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index 25af84522a4ec..71c9dc78f6e9f 100644

index 4a844f52afd20..d6399b27e7efd 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -202,6 +202,8 @@ CHAR_LIMIT guidelines:

From d91eb8daeba2dc5820e01b891b36e1f128879da9 Mon Sep 17 00:00:00 2001

From 5bb8a5046c00fd8c8ae738e1964c40f353c8270d Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishithkhanna@e.email>

Date: Tue, 20 Feb 2024 20:35:25 +0530

Subject: Change accent and switch to match our palette

 create mode 100644 components/browser_ui/styles/android/java/res/drawable/e_switch_track.xml

diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java

index aedbaf300f8e8..1e71390ecda3c 100644

index c41606b118dcc..c5a8859a2334b 100644

--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java

+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java

@@ -57,7 +57,8 @@ public class TabUiThemeProvider {

         app:srcCompat="@drawable/ic_check_circle_filled_green_24dp" />

 </LinearLayout>

diff --git a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml

index ecc6bc6b9b150..175082479e551 100644

index 5cf2ef6aa513b..2a83ae31aed43 100644

--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml

+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml

@@ -20,4 +20,4 @@ found in the LICENSE file.

         textSelectHandle.mutate().setTint(color);

         textSelectHandleLeft.mutate().setTint(color);

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java

index 72a03b7464368..9894de5a37ea3 100644

index cba1b14211209..f539dafc602eb 100644

--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java

+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java

@@ -399,7 +399,7 @@ public class OmniboxResourceProvider {

-    app:drawableTint="?attr/colorPrimary" />

+    app:drawableTint="@color/default_control_color_active_baseline" />

diff --git a/components/browser_ui/styles/android/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn

index 5fef7846be301..a7e72a0ca50c6 100644

index 01ce0d27646f6..191d029e540a3 100644

--- a/components/browser_ui/styles/android/BUILD.gn

+++ b/components/browser_ui/styles/android/BUILD.gn

@@ -79,6 +79,8 @@ android_resources("java_resources") {

@@ -83,6 +83,8 @@ android_resources("java_resources") {

     "java/res/color/tonal_button_bg_list.xml",

     "java/res/color/tonal_button_icon_tint_list.xml",

     "java/res/color/toolbar_icon_unfocused_activity_tint_list.xml",

+    "java/res/color/e_switch_thumb_color.xml",

+    "java/res/color/e_switch_track_color.xml",

     "java/res/drawable-hdpi/btn_star_filled.png",

     "java/res/drawable-hdpi/ic_delete_white_24dp.png",

     "java/res/drawable-hdpi/ic_edit_24dp.png",

@@ -264,6 +266,8 @@ android_resources("java_resources") {

     "java/res/drawable-hdpi/ic_logo_googleg_24dp.png",

     "java/res/drawable-hdpi/ic_open_in_new_white_24dp.png",

     "java/res/drawable-hdpi/ic_pause_white_36dp.png",

@@ -245,6 +247,8 @@ android_resources("java_resources") {

     "java/res/drawable/secured_by_brand_shield_24.xml",

     "java/res/drawable/smartphone_black_24dp.xml",

     "java/res/drawable/star_outline_24dp.xml",

     "java/res/drawable/toolbar_hairline.xml",

+    "java/res/drawable/e_switch_thumb.xml",

+    "java/res/drawable/e_switch_track.xml",

+    <corners android:radius="50dp" />

+</shape>

diff --git a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

index a30824787ade2..b59dd03f0dd9c 100644

index dd9b5c34cabb8..b5b6d9d017ab0 100644

--- a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

+++ b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

@@ -9,11 +9,11 @@ found in the LICENSE file.

     <macro name="default_text_color_on_accent1_container">?attr/colorOnPrimaryContainer</macro>

     <macro name="default_text_color_on_accent2_container">?attr/colorOnSecondaryContainer</macro>

diff --git a/components/browser_ui/styles/android/java/res/values/styles.xml b/components/browser_ui/styles/android/java/res/values/styles.xml

index 79c71e3c4eb4a..9f07872eaa56b 100644

index 33c655a1f1150..3b5542c3dab38 100644

--- a/components/browser_ui/styles/android/java/res/values/styles.xml

+++ b/components/browser_ui/styles/android/java/res/values/styles.xml

@@ -20,9 +20,13 @@ found in the LICENSE file.

         <!-- android:textColorHighlight applied by Material3 is too dark, so we override it with our

              own color state list to specify a lower alpha. -->

diff --git a/components/browser_ui/theme/android/templates/res/values/themes.xml b/components/browser_ui/theme/android/templates/res/values/themes.xml

index f8abbc6160459..6fec33101e751 100644

index 5e782ea84da7d..5aaa0c0c17b87 100644

--- a/components/browser_ui/theme/android/templates/res/values/themes.xml

+++ b/components/browser_ui/theme/android/templates/res/values/themes.xml

@@ -60,7 +60,7 @@ Note: This is a jinja2 template, processed at build time into the final resource

@@ -61,7 +61,7 @@ Note: This is a jinja2 template, processed at build time into the final resource

         <!-- Elevation overlays -->

         <item name="elevationOverlayEnabled">true</item>

         <item name="elevationOverlayColor">@color/gm3_baseline_surface_tint</item>

         <item name="android:listChoiceBackgroundIndicator">@drawable/list_item_ripple</item>

@@ -91,7 +91,7 @@ Note: This is a jinja2 template, processed at build time into the final resource

@@ -92,7 +92,7 @@ Note: This is a jinja2 template, processed at build time into the final resource

         <!-- Control styles -->

         <item name="checkboxStyle">@style/Widget.BrowserUI.CheckBox</item>

         <item name="radioButtonStyle">@style/Widget.BrowserUI.RadioButton</item>

         android:layout_width="wrap_content"

         android:layout_height="wrap_content" />

diff --git a/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml

index debe5cdf1f917..3dd2a43c84713 100644

index 21b6f3dc7b9d3..6c5dfd7e7032a 100644

--- a/ui/android/java/res/values/color_palette.xml

+++ b/ui/android/java/res/values/color_palette.xml

@@ -11,14 +11,14 @@ found in the LICENSE file.

@@ -11,13 +11,13 @@ found in the LICENSE file.

     <color name="baseline_primary_100">@android:color/white</color>

     <color name="baseline_primary_95">#ECF3FE</color>

     <color name="baseline_primary_90">#D3E3FD</color>

+    <color name="baseline_primary_80">#5DB2FF</color>

     <color name="baseline_primary_80_alpha_10" tools:ignore="UnusedResources">#19A8C7FA</color>

     <color name="baseline_primary_80_alpha_20">#33A8C7FA</color>

     <color name="baseline_primary_80_alpha_50">#80A8C7FA</color>

     <color name="baseline_primary_70">#7CACF8</color>

     <color name="baseline_primary_60">#4C8DF6</color>

     <color name="baseline_primary_50">#1B6EF3</color>

     <color name="baseline_primary_40_alpha_6">#0F0B57D0</color>

     <color name="baseline_primary_40_alpha_10">#190B57D0</color>

     <color name="baseline_primary_40_alpha_12">#1F0B57D0</color>

@@ -174,4 +174,8 @@ found in the LICENSE file.

@@ -173,4 +173,8 @@ found in the LICENSE file.

     <color name="material_tertiary_80">@color/baseline_tertiary_80</color>

     <color name="material_tertiary_40">@color/baseline_tertiary_40</color>

From 26ff9045f83216f97876e79cc5ad065c5697d35d Mon Sep 17 00:00:00 2001

From 118133248a5ad84defd81e0d42353f539b280d1c Mon Sep 17 00:00:00 2001

From: Michael Gilbert <mgilbert@debian.org>

Date: Wed, 21 Nov 2018 02:37:35 +0000

Subject: Disable support for RAR files inspection

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../download_protection/file_analyzer.cc        |  2 +-

 .../services/file_util/safe_archive_analyzer.cc   | 15 ++-------------

 chrome/utility/safe_browsing/archive_analyzer.cc  |  2 +-

 3 files changed, 4 insertions(+), 15 deletions(-)

 .../services/file_util/safe_archive_analyzer.cc | 17 ++---------------

 .../utility/safe_browsing/archive_analyzer.cc   |  2 +-

 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc

index d277ead20349e..7d07ff3a5a3d5 100644

index 220470df5e946..9403a9649ecfe 100644

--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc

+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc

@@ -80,7 +80,7 @@ void FileAnalyzer::Start(const base::FilePath& target_file_name,

@@ -85,7 +85,7 @@ void FileAnalyzer::Start(const base::FilePath& target_file_name,

   }

   if (inspection_type == DownloadFileType::RAR) {

   }

diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc

index f5a860c8b1943..5473bfb95f599 100644

index 1e4b57253df49..33089d510f214 100644

--- a/chrome/services/file_util/safe_archive_analyzer.cc

+++ b/chrome/services/file_util/safe_archive_analyzer.cc

@@ -78,19 +78,8 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(

@@ -87,21 +87,8 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(

   DCHECK(rar_file.IsValid());

   temp_file_getter_.Bind(std::move(temp_file_getter));

   callback_ = std::move(callback);

-                              weak_factory_.GetWeakPtr());

-  timeout_timer_.Start(FROM_HERE, kArchiveAnalysisTimeout, this,

-                       &SafeArchiveAnalyzer::Timeout);

-  rar_analyzer_.SetAnalysisDelegate(

-      std::make_unique<safe_browsing::RegularArchiveAnalysisDelegate>());

-  rar_analyzer_.Analyze(std::move(rar_file), base::FilePath(),

-                        /*password=*/password,

-                        std::move(analysis_finished_callback),

   std::move(callback).Run(safe_browsing::ArchiveAnalyzerResults());

 #endif

diff --git a/chrome/utility/safe_browsing/archive_analyzer.cc b/chrome/utility/safe_browsing/archive_analyzer.cc

index b1302b7928484..5410eab6c164f 100644

index 074c46367b489..9617fc65c3646 100644

--- a/chrome/utility/safe_browsing/archive_analyzer.cc

+++ b/chrome/utility/safe_browsing/archive_analyzer.cc

@@ -40,7 +40,7 @@ std::unique_ptr<ArchiveAnalyzer> ArchiveAnalyzer::CreateForArchiveType(

 #endif

-- 

2.34.1

2.52.0

From 5a315dd35ba564e5c9e39cb1da7f891bfa70f7b1 Mon Sep 17 00:00:00 2001

From ecd3589b7cf611a891184f461917d29df29c8d6b 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

---

 .../src/org/chromium/base/PackageManagerUtils.java     | 10 ++++++++++

 chrome/android/java/AndroidManifest.xml                |  4 ++++

 .../chrome/browser/LaunchIntentDispatcher.java         |  2 +-

 .../browser/document/ChromeLauncherActivity.java       |  2 +-

 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/base/android/java/src/org/chromium/base/PackageManagerUtils.java b/base/android/java/src/org/chromium/base/PackageManagerUtils.java

     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 30066d4b56ad1..c9fd59c196e1c 100644

index e9c9e7c1a5890..0a2954d01ad35 100644

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

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

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

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

             <intent-filter>

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

             </intent-filter>

             <intent-filter>

                 <action android:name="com.sec.android.airview.HOVER" />

             </intent-filter>

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

index d082bd2e19eaa..dd09dfd07e7df 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java

@@ -247,7 +247,7 @@ public class LaunchIntentDispatcher {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

index cc6a92a5d4530..27a83695c4b95 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

@@ -178,7 +178,7 @@ public class ChromeLauncherActivity extends Activity {

         Intent searchIntent = new Intent(Intent.ACTION_WEB_SEARCH);

         searchIntent.putExtra(SearchManager.QUERY, query);

-        if (PackageManagerUtils.canResolveActivity(

+        if (PackageManagerUtils.canOnlyOthersResolveActivity(

                 searchIntent, PackageManager.GET_RESOLVED_FILTER)) {

             mActivity.startActivity(searchIntent);

             startActivity(searchIntent);

         } else {

-- 

2.52.0