Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git apply result for master branch #604

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Git apply result for master branch #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions build/patches/00Cromite-Branding.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
chrome/android/java/AndroidManifest.xml | 2 +-
.../res/xml/legal_information_preferences.xml | 12 ------
.../android/java/res/xml/main_preferences.xml | 8 ++--
.../drawable/themed_app_icon.xml | 37 ++++++++++--------
.../drawable/themed_app_icon.xml | 29 ++++++++-------
.../mipmap-hdpi/app_icon.png | Bin 2435 -> 5784 bytes
.../mipmap-hdpi/layered_app_icon.png | Bin 1836 -> 7839 bytes
.../layered_app_icon_background.png | Bin 1487 -> 20191 bytes
Expand All @@ -26,7 +26,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../mipmap-xxxhdpi/layered_app_icon.png | Bin 3652 -> 29220 bytes
.../layered_app_icon_background.png | Bin 3519 -> 142032 bytes
.../chrome/browser/omaha/UpdateConfigs.java | 2 +-
.../inline/BromiteInlineUpdateController.java | 21 ++++++++--
.../inline/BromiteInlineUpdateController.java | 21 +++++++++--
chrome/app/extensions_strings.grdp | 4 +-
chrome/app/settings_strings.grdp | 2 +-
chrome/app/theme/chromium/BRANDING | 8 ++--
Expand All @@ -46,8 +46,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../drawable-xhdpi/fre_product_logo.png | Bin 5151 -> 34576 bytes
.../drawable-xxhdpi/fre_product_logo.png | Bin 7720 -> 60959 bytes
.../drawable-xxxhdpi/fre_product_logo.png | Bin 10740 -> 93273 bytes
tools/grit/grit/grd_reader.py | 35 +++++++++++++++++
43 files changed, 108 insertions(+), 57 deletions(-)
tools/grit/grit/grd_reader.py | 35 ++++++++++++++++++
43 files changed, 104 insertions(+), 53 deletions(-)

diff --git a/build/BUILD.gn b/build/BUILD.gn
--- a/build/BUILD.gn
Expand Down Expand Up @@ -149,20 +149,16 @@ diff --git a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
-->

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="90dp"
- android:height="90dp"
- android:viewportWidth="90"
- android:viewportHeight="90">
- <group>
- <clip-path
- android:pathData="M27,27h36v36h-36z"/>
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:name="vector"
+ android:width="90dp"
+ android:height="90dp"
+ android:viewportWidth="90"
+ android:viewportHeight="90">
android:width="90dp"
android:height="90dp"
android:viewportWidth="90"
android:viewportHeight="90">
- <group>
- <clip-path
- android:pathData="M27,27h36v36h-36z"/>
+ <group android:name="group_1">
<path
- android:pathData="M35.7727,42.5589C36.3164,40.5268 37.5153,38.7308 39.1836,37.4494C40.8519,36.168 42.8963,35.4727 44.9999,35.4714H60.2305C58.6975,33.0202 56.5955,30.9753 54.1031,29.5104C51.6106,28.0454 48.8014,27.2038 45.9141,27.0569C43.0267,26.91 40.1466,27.4623 37.5184,28.6667C34.8901,29.8711 32.5914,31.6922 30.8176,33.9752L35.7727,42.5589Z"
Expand Down
2 changes: 1 addition & 1 deletion build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7150,7 +7150,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
@@ -37,6 +41,7 @@ android_library("java") {
@@ -38,6 +42,7 @@ android_library("java") {
java_cpp_strings("java_pref_names_srcjar") {
sources = [
"//chrome/common/pref_names.h",
Expand Down
Loading