Brian Johnson
f1cece5cf2
Android xml overlay files are showing up for all platforms when running update_patches because they are unconditionally copied now. Some of them should be patches anyway so they were converted, but others should ideally be resource overlays. For now we'll add the resource overlays to the update patch ignore list
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml b/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml
|
|
index f5420c8bdeb9dc0065a33a9af772efefba6e0feb..a7430d9077179200349af539d4fb9cc4a5d3721c 100644
|
|
--- a/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml
|
|
+++ b/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.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.toolbar.bottom.ScrollingBottomViewResourceFrameLayout
|
|
+<org.chromium.chrome.browser.toolbar.bottom.BraveScrollingBottomViewResourceFrameLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:layout_width="match_parent"
|
|
@@ -31,6 +31,7 @@ found in the LICENSE file.
|
|
android:layout_height="match_parent"
|
|
android:id="@+id/bottom_container_slot" />
|
|
|
|
+ <include layout="@layout/bottom_toolbar" />
|
|
</LinearLayout>
|
|
|
|
-</org.chromium.chrome.browser.toolbar.bottom.ScrollingBottomViewResourceFrameLayout>
|
|
+</org.chromium.chrome.browser.toolbar.bottom.BraveScrollingBottomViewResourceFrameLayout>
|