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

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

Update our patches which are conflicting or cause build errors

parent 24fd607c

build/e_patches/Browser-disable-search-provider-logo.patch

+11 −10
Original line number Diff line number Diff line 
From 1aef8ca17a44a7ef2fc8649fb07c4bf894a787db Mon Sep 17 00:00:00 2001

From 424324177b26b8f7672b7aa0225b972a960f5142 Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

Date: Mon, 17 Jun 2019 12:03:52 -0400

Subject: Browser: disable search provider logo



---

 .../android/template_url_service_android.cc   | 23 +------------------

 1 file changed, 1 insertion(+), 22 deletions(-)

 .../android/template_url_service_android.cc   | 24 +------------------

 1 file changed, 1 insertion(+), 23 deletions(-)



diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc

index 7781eb3badf23..5092c7cc4cc0b 100644

index bc91d780998a5..6f7a119cb3e6a 100644

--- a/components/search_engines/android/template_url_service_android.cc

+++ b/components/search_engines/android/template_url_service_android.cc

@@ -187,28 +187,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(

@@ -175,29 +175,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(JNIEnv* env) {

 

 jboolean TemplateUrlServiceAndroid::DoesDefaultSearchEngineHaveLogo(

     JNIEnv* env,

     const JavaParamRef<jobject>& obj) {

     JNIEnv* env) {

-  // |kSearchProviderLogoURL| applies to all search engines (Google or

-  // third-party).

-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -23,8 +23,9 @@ index 7781eb3badf23..5092c7cc4cc0b 100644 
-  }

-

-  // Google always has a logo.

-  if (IsDefaultSearchEngineGoogle(env, obj))

-  if (IsDefaultSearchEngineGoogle(env)) {

-    return true;

-  }

-

-  // Third-party search engines can have a doodle specified via the command

-  // line, or a static logo or doodle from the TemplateURLService.
@@ -40,7 +41,7 @@ index 7781eb3badf23..5092c7cc4cc0b 100644 
+  return false;

 }

 

 jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(

 jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(JNIEnv* env) {

-- 

2.50.0

2.50.1

build/e_patches/Change-accent-and-switch-to-match-our-palette.patch

+57 −87
Original line number Diff line number Diff line 
From 7b845491b59ae1054bf9f9efc1392312f00ca195 Mon Sep 17 00:00:00 2001

From 9a988ba8dd1ceadb670d3fd09dd222aa15369e41 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



---

 .../keyboard_accessory_sheet_tab_option_toggle.xml       | 2 +-

 .../tasks/tab_management/TabUiThemeProvider.java     | 12 ++++--------

 .../browser/tasks/tab_management/TabUiThemeProvider.java | 9 +++++----

 .../java/res/layout/improved_bookmark_save_flow.xml      | 2 +-

 .../res/layout/incognito_cookie_controls_card.xml    |  2 +-

 .../java/res/layout/readaloud_toggle_switch.xml      |  2 +-

 .../layout/fast_checkout_autofill_profile_item.xml   |  2 +-

 .../res/layout/fast_checkout_credit_card_item.xml    |  2 +-

 .../java/res/layout/incognito_cookie_controls_card.xml   | 2 +-

 .../android/java/res/layout/readaloud_toggle_switch.xml  | 2 +-

 .../res/layout/fast_checkout_autofill_profile_item.xml   | 2 +-

 .../java/res/layout/fast_checkout_credit_card_item.xml   | 2 +-

 .../java/res/layout/fast_checkout_footer_item.xml        | 2 +-

 .../chrome/browser/omnibox/UrlBarViewBinder.java         | 2 +-

 .../omnibox/styles/OmniboxResourceProvider.java      |  2 +-

 .../browser/omnibox/styles/OmniboxResourceProvider.java  | 2 +-

 .../account_picker_bottom_sheet_new_account_row.xml      | 2 +-

 components/browser_ui/styles/android/BUILD.gn            | 4 ++++

 .../android/java/res/color/e_switch_thumb_color.xml      | 5 +++++

 .../android/java/res/color/e_switch_track_color.xml      | 6 ++++++

 .../android/java/res/color/text_highlight_color.xml      | 2 +-

 .../android/java/res/drawable/e_switch_thumb.xml     |  9 +++++++++

 .../android/java/res/drawable/e_switch_track.xml     |  9 +++++++++

 .../java/res/values/semantic_colors_dynamic.xml      |  6 +++---

 .../styles/android/java/res/values/styles.xml        |  4 ++++

 .../styles/android/java/res/values/themes.xml        |  2 +-

 .../theme/android/java/res/values/themes.xml         | 10 +++++-----

 .../android/java/res/layout/preference_switch.xml    |  2 +-

 .../styles/android/java/res/drawable/e_switch_thumb.xml  | 9 +++++++++

 .../styles/android/java/res/drawable/e_switch_track.xml  | 9 +++++++++

 .../android/java/res/values/semantic_colors_dynamic.xml  | 6 +++---

 .../browser_ui/styles/android/java/res/values/styles.xml | 4 ++++

 .../browser_ui/styles/android/java/res/values/themes.xml | 2 +-

 .../theme/android/templates/res/values/themes.xml        | 4 ++--

 .../widget/android/java/res/layout/preference_switch.xml | 2 +-

 .../android/res/layout/infobar_control_toggle.xml        | 2 +-

 ui/android/java/res/values/color_palette.xml             | 8 ++++++--

 24 files changed, 69 insertions(+), 32 deletions(-)

 24 files changed, 67 insertions(+), 25 deletions(-)

 create mode 100644 components/browser_ui/styles/android/java/res/color/e_switch_thumb_color.xml

 create mode 100644 components/browser_ui/styles/android/java/res/color/e_switch_track_color.xml

 create mode 100644 components/browser_ui/styles/android/java/res/drawable/e_switch_thumb.xml
@@ -48,37 +48,34 @@ index 9d1713c43e8b1..5cefd325aae52 100644 
         android:layout_marginStart="16dp"

         android:layout_width="48dp"

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 fe3a90948822e..4314cf8035a75 100644

index 0e60d9b20e26c..4b87c7e4098f5 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

@@ -49,7 +49,7 @@ public class TabUiThemeProvider {

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

             return AppCompatResources.getColorStateList(

                     context, R.color.incognito_tab_bg_selected_color);

         }

         return ColorStateList.valueOf(

-                MaterialColors.getColor(context, org.chromium.chrome.R.attr.colorPrimary, TAG));

-        return ColorStateList.valueOf(MaterialColors.getColor(context, R.attr.colorPrimary, TAG));

+        return ColorStateList.valueOf(

+                context.getColor(R.color.default_control_color_active_baseline));

     }

 

     /**

@@ -100,9 +100,7 @@ public class TabUiThemeProvider {

@@ -102,7 +103,7 @@ public class TabUiThemeProvider {

         } else {

             if (isSelected) {

                 @ColorInt

-                int baseColor =

-                        MaterialColors.getColor(

-                                context, org.chromium.chrome.R.attr.colorPrimary, TAG);

-                int baseColor = MaterialColors.getColor(context, R.attr.colorPrimary, TAG);

+                int baseColor = context.getColor(R.color.default_control_color_active_baseline);

                 int alpha =

                         context.getResources()

                                 .getInteger(

@@ -171,10 +169,8 @@ public class TabUiThemeProvider {

@@ -171,8 +172,8 @@ public class TabUiThemeProvider {

                             ? R.color.incognito_tab_grid_dialog_ungroup_bar_text_hovered_color

                             : R.color.incognito_tab_grid_dialog_ungroup_bar_text_color);

         } else {

-            return MaterialColors.getColor(

-                    context,

-                    isTabHovered ? R.attr.colorOnPrimary : org.chromium.chrome.R.attr.colorPrimary,

-                    TAG);

-                    context, isTabHovered ? R.attr.colorOnPrimary : R.attr.colorPrimary, TAG);

+            return isTabHovered ? MaterialColors.getColor(context, R.attr.colorOnPrimary, TAG)

+                    : context.getColor(R.color.default_control_color_active_baseline);

         }
@@ -184,20 +181,20 @@ index e54b751094641..9d8409152c4c1 100644 
 

     /**

diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_new_account_row.xml b/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_new_account_row.xml

index 56a1aac203baa..40a9798da1323 100644

index b9570b7802f1e..b6f8b814a802d 100644

--- a/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_new_account_row.xml

+++ b/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_new_account_row.xml

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

     android:textDirection="locale"

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

     android:textAppearance="@style/TextAppearance.TextAccentMediumThick.Link"

     android:clipToOutline="true"

     app:drawableStartCompat="@drawable/ic_person_add_40dp"

-    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 cce4e2a169cfc..2cfc3c28e3e2e 100644

index 0eebc801da340..003817b0dff23 100644

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

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

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

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

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

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

     "java/res/color/toolbar_icon_unfocused_activity_tint_list.xml",
@@ -206,7 +203,7 @@ index cce4e2a169cfc..2cfc3c28e3e2e 100644 
     "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",

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

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

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

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

     "java/res/drawable/toolbar_hairline.xml",
@@ -307,7 +304,7 @@ index 8cfae64f0119c..7985902587a2a 100644 
     <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 f16bea1ee03dd..e56c7cde5d4e0 100644

index 516d07c84d033..5b8e12e1996d0 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.
@@ -325,10 +322,10 @@ index f16bea1ee03dd..e56c7cde5d4e0 100644 
     <style name="Widget.BrowserUI.Switch.Incognito">

         <item name="materialThemeOverlay">@style/ThemeOverlay.BrowserUI.Switch.Incognito</item>

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

index 05416a0493cb5..bc3f9e31f3573 100644

index e35c47cafc081..742752e51f527 100644

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

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

@@ -24,7 +24,7 @@ found in the LICENSE file.

@@ -27,7 +27,7 @@ found in the LICENSE file.

     </style>

 

     <style name="ThemeOverlay.BrowserUI.DynamicColors" parent="ThemeOverlay.Material3.DynamicColors.DayNight">
@@ -337,55 +334,28 @@ index 05416a0493cb5..bc3f9e31f3573 100644 
         <item name="elevationOverlayAccentColor">@android:color/transparent</item>

         <!-- 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/java/res/values/themes.xml b/components/browser_ui/theme/android/java/res/values/themes.xml

index a56f9979a4a2a..738e673898539 100644

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

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

@@ -52,7 +52,7 @@ found in the LICENSE file.

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 b84a8887aca9c..60404ab759509 100644

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

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

@@ -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="elevationOverlayAccentColor">@android:color/transparent</item>

+        <item name="elevationOverlayAccentColor">@color/default_control_color_active_baseline</item>

 

         <!-- Dynamic colors that are applied to the buttons and links. -->

         <item name="globalFilledButtonBgColor">@color/filled_button_bg_dynamic_list</item>

@@ -78,7 +78,7 @@ found in the LICENSE file.

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

 

@@ -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>

-        <item name="materialSwitchStyle">@style/Widget.BrowserUI.Switch</item>

+        <item name="switchStyle">@style/Widget.BrowserUI.Switch</item>

 

         <!-- Window Properties -->

         <item name="android:windowBackground">@macro/default_bg_color</item>

@@ -173,7 +173,7 @@ found in the LICENSE file.

         <!-- Elevation overlays -->

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

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

-        <item name="elevationOverlayAccentColor">@android:color/transparent</item>

+        <item name="elevationOverlayAccentColor">@color/default_control_color_active_baseline</item>

 

         <!-- Dynamic colors that are applied to the buttons and links. -->

         <item name="globalFilledButtonBgColor">@color/filled_button_bg_dynamic_list</item>

@@ -187,7 +187,7 @@ found in the LICENSE file.

         <item name="globalClickableSpanColor">?attr/colorPrimary</item>

 

         <!-- Widgets style override-->

-        <item name="materialSwitchStyle">@style/Widget.BrowserUI.Switch</item>

+        <item name="switchStyle">@style/Widget.BrowserUI.Switch</item>

         <!-- Switches style workaround for UI that might use SwitchPreferenceCompat while not

          using the theme for SettingsActivity (e.g. PageInfoView) -->

         <item name="switchPreferenceCompatStyle">@style/SwitchPreference</item>

@@ -271,7 +271,7 @@ found in the LICENSE file.

 

         <!--  Overriding AppCompat values -->

         <item name="spinnerStyle">@style/SpinnerStyle</item>

-        <item name="materialSwitchStyle">@style/Widget.BrowserUI.Switch</item>

+        <item name="switchStyle">@style/Widget.BrowserUI.Switch</item>

         <!-- Switches style workaround for UI that might use SwitchPreferenceCompat while not

          using the theme for SettingsActivity (e.g. PageInfoView) -->

         <item name="switchPreferenceCompatStyle">@style/SwitchPreference</item>

         <!-- Status bar color -->

         <item name="android:statusBarColor">@android:color/black</item>

diff --git a/components/browser_ui/widget/android/java/res/layout/preference_switch.xml b/components/browser_ui/widget/android/java/res/layout/preference_switch.xml

index 38671522f2d23..7d52745ef0f81 100644

--- a/components/browser_ui/widget/android/java/res/layout/preference_switch.xml
@@ -413,7 +383,7 @@ index 209d2a1568df5..c615ca94ceffa 100644 
         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 ca72a1171dc5d..0f12ed417382f 100644

index 61d774a20f3d0..fc06f952446e5 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.
@@ -433,7 +403,7 @@ index ca72a1171dc5d..0f12ed417382f 100644 
     <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>

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

@@ -169,4 +169,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>
@@ -443,5 +413,5 @@ index ca72a1171dc5d..0f12ed417382f 100644 
+    <color name="e_switch_track_off">#C8CED0</color>

 </resources>

-- 

2.50.0

2.50.1

build/e_patches/Multiple-fingerprinting-mitigations.patch

+61 −62

File changed.

Preview size limit exceeded, changes collapsed.

build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch

+12 −12
Original line number Diff line number Diff line 
From a211f3b4322bce18833b5322a8d95387b0b23f2a Mon Sep 17 00:00:00 2001

From d94a29012e6d9bfa83dc4b484292d839a8cb64f8 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 20 Sep 2023 09:48:52 +0530

Subject: fixup Disable fetching of all field trials
@@ -6,7 +6,7 @@ Subject: fixup Disable fetching of all field trials 
---

 .../services/SafeModeVariationsSeedContentProvider.java   | 8 +-------

 build/android/gyp/proguard.py                             | 2 ++

 .../service/variations_field_trial_creator_base.cc        | 2 ++

 .../variations/service/variations_field_trial_creator.cc  | 2 ++

 3 files changed, 5 insertions(+), 7 deletions(-)



diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java
@@ -29,23 +29,23 @@ index ad626ddfe4ef8..d6b55d4be62e4 100644 
 

     @Override

diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py

index 8bc159a6f5a59..49daecae0cf4d 100755

index de84397b813b5..bee4bc9775d98 100755

--- a/build/android/gyp/proguard.py

+++ b/build/android/gyp/proguard.py

@@ -54,6 +54,8 @@ _IGNORE_WARNINGS = (

@@ -50,6 +50,8 @@ _IGNORE_WARNINGS = (

         r'PaymentRequest[BH]',

         # com.google.android.gms.cast is stripped down from the build

         r'class com\.google\.android\.gms\.',

         # This service is defined in Native not Java.

         r'NativeServiceSandboxedProcessService',

+        # No fetching of trials

+        r'org\.chromium\.android_webview\.services\.AwVariationsSeedFetcher',

     ]) + ')',

     # We enforce that this class is removed via -checkdiscard.

     r'FastServiceLoader\.class:.*Could not inline ServiceLoader\.load',

diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc

index ad025b8f2c58c..1e46839dd58ed 100644

--- a/components/variations/service/variations_field_trial_creator_base.cc

+++ b/components/variations/service/variations_field_trial_creator_base.cc

@@ -325,6 +325,8 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(

diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc

index bd297408fcd07..ceb35866701aa 100644

--- a/components/variations/service/variations_field_trial_creator.cc

+++ b/components/variations/service/variations_field_trial_creator.cc

@@ -323,6 +323,8 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(

 

   platform_field_trials->RegisterFeatureOverrides(feature_list.get());
@@ -55,5 +55,5 @@ index ad025b8f2c58c..1e46839dd58ed 100644 
 

   // For testing Variations Safe Mode, maybe crash here.

-- 

2.50.0

2.50.1