Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CodeHealth][Android] Ignore more patches for overwritten resources (#34534)

Browse Source 
* [CodeHealth][Android] Ignore patch generation for overwritten resources

This is update of the Android resources list we should
not generate patch for because we overwrite them.

Converted bookmark_toolbar.xml layout file override to patch, 
because it is trivial.

Resolves https://github.com/brave/brave-browser/issues/53436
This commit is contained in:
AlexeyBarabash
2026-03-11 15:14:28 +02:00
committed by GitHub
parent eaf9c46ee5
commit 01e05371c8
3 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/layout/bookmark_toolbar.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2023 The Brave Authors. All rights reserved.
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this file,
You can obtain one at https://mozilla.org/MPL/2.0/.
-->
<org.chromium.chrome.browser.bookmarks.BraveBookmarkToolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/bookmark_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_no_shadow"
style="@style/ModernToolbar"
app:popupTheme="@style/ModernToolbarPopupTheme" />
build/update_patches_exclusions.cfg
+27
View File
@@ -20,9 +20,36 @@ chrome/VERSION
ui/webui/resources/css/text_defaults_md.css
# TODO(https://github.com/brave/brave-browser/issues/51969) convert these to
# android_resources targets with resource_overlay = true
chrome/android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_bottom_window.xml
chrome/android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_cloud_left.xml
chrome/android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_cloud_right.xml
chrome/android/features/tab_ui/java/res/drawable/phone_tab_switcher_empty_state_illustration_top_window.xml
chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
chrome/android/java/res/drawable/adaptive_toolbar_preference_header.xml
chrome/android/java/res/drawable/arrow_back_24px.xml
chrome/android/java/res/drawable/arrow_forward_24px.xml
chrome/android/java/res/drawable/bookmark_empty_state_illustration.xml
chrome/android/java/res/drawable/chrome_logo_on_circular_background.xml
chrome/android/java/res/drawable/history_empty_state_illustration.xml
chrome/android/java/res/drawable/ic_add_box_rounded_corner.xml
chrome/android/java/res/drawable/ic_add_to_home_screen.xml
chrome/android/java/res/drawable/ic_find_in_page.xml
chrome/android/java/res/drawable/ic_incognito_reauth_promo_icon.xml
chrome/android/java/res/drawable/ic_refresh_24dp_rtl.xml
chrome/android/java/res/drawable/ic_translate.xml
chrome/android/java/res/drawable/incognito_history_placeholder_image.xml
chrome/android/java/res/drawable/phone_recent_tab_empty_state_illustration.xml
chrome/android/java/res/drawable/reading_list_empty_state_illustration.xml
chrome/android/java/res/drawable/tablet_recent_tab_empty_state_illustration.xml
chrome/android/java/res/layout/new_tab_page_incognito.xml
chrome/android/java/res/layout/new_tab_page_layout.xml
chrome/android/java/res/xml/developer_preferences.xml
chrome/android/java/res/xml/legal_information_preferences.xml
chrome/android/java/res/xml/manage_sync_preferences.xml
chrome/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml
components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml
components/browser_ui/styles/android/java/res/drawable/ic_home_24dp.xml
components/browser_ui/styles/android/java/res/drawable/ic_incognito_24dp.xml
components/browser_ui/styles/android/java/res/drawable/ic_incognito_fill_24dp.xml
components/browser_ui/styles/android/java/res/drawable/ic_info_24dp.xml
components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml
patches/chrome-android-java-res-layout-bookmark_toolbar.xml.patch
+20
View File
@@ -0,0 +1,20 @@
diff --git a/chrome/android/java/res/layout/bookmark_toolbar.xml b/chrome/android/java/res/layout/bookmark_toolbar.xml
index b45d8811f88453f96a788d23bf1c1fdd61869708..57e09aa918f9002f6376e42b5ed2ece5f059dbc0 100644
--- a/chrome/android/java/res/layout/bookmark_toolbar.xml
+++ b/chrome/android/java/res/layout/bookmark_toolbar.xml
@@ -5,7 +5,7 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<org.chromium.chrome.browser.bookmarks.BookmarkToolbar
+<org.chromium.chrome.browser.bookmarks.BraveBookmarkToolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/bookmark_toolbar"
@@ -13,4 +13,4 @@ found in the LICENSE file.
android:layout_height="@dimen/toolbar_height_no_shadow"
style="@style/ModernToolbar"
app:popupTheme="@style/ModernToolbarPopupTheme"
- android:focusable="true" />
\ No newline at end of file
+ />