Skip to content

Commit fa10298

Browse files
committed
Uplift of #29416 (squashed) to release
1 parent 87f7c6b commit fa10298

File tree

5 files changed

+3
-22
lines changed

5 files changed

+3
-22
lines changed

android/brave_java_resources.gni

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ brave_java_resources = [
106106
"java/res/drawable-mdpi/uphold_green.png",
107107
"java/res/drawable-mdpi/uphold_white.png",
108108
"java/res/drawable-night-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png",
109+
"java/res/drawable-night-nodpi/widget_preview.png",
109110
"java/res/drawable-night/bookmark_empty_state_illustration.xml",
110111
"java/res/drawable-night/ellipse_217.xml",
111112
"java/res/drawable-night/history_empty_state_illustration.xml",
Loading
Loading

chromium_src/chrome/android/expectations/lint-suppressions.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
<ignore regexp="The resource `R.drawable.quick_action_search_widget_.*` appears to be unused"/>
3838
<ignore regexp="The resource `R.drawable.hairline_border` appears to be unused"/>
3939
<ignore regexp="The resource `R.string.dino_widget_description` appears to be unused"/>
40-
<ignore regexp="The resource `R.string.search_widget_description` appears to be unused"/>
41-
<ignore regexp="The resource `R.string.search_widget_title` appears to be unused"/>
42-
<ignore regexp="The resource `R.xml.search_widget_info` appears to be unused"/>
43-
<ignore regexp="The resource `R.drawable.widget_preview` appears to be unused"/>
4440
<ignore regexp="The resource `R.style.IncognitoTextViewWithClickableSpans` appears to be unused"/>
4541
<ignore regexp="The resource `R.style.IncognitoNewTabLearnMoreLinkModernTextView` appears to be unused"/>
4642
<ignore regexp="The resource `R.style.IncognitoNewTabTextView` appears to be unused"/>

patches/chrome-android-java-AndroidManifest.xml.patch

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
2-
index 54244bbdcb5a7599c6182e6092236f29b4b7a795..06feab4bb82d43237dbcbd170d0dabf8ba313ffd 100644
2+
index 54244bbdcb5a7599c6182e6092236f29b4b7a795..02c2a50e2f23783c64113c3c022d446f4e3b8ded 100644
33
--- a/chrome/android/java/AndroidManifest.xml
44
+++ b/chrome/android/java/AndroidManifest.xml
55
@@ -28,6 +28,7 @@ by a child template that "extends" this file.
@@ -90,23 +90,7 @@ index 54244bbdcb5a7599c6182e6092236f29b4b7a795..06feab4bb82d43237dbcbd170d0dabf8
9090

9191
<!-- Bookmarks widget -->
9292
<receiver android:name="com.google.android.apps.chrome.appwidget.bookmarks.BookmarkThumbnailWidgetProvider"
93-
@@ -936,6 +952,7 @@ by a child template that "extends" this file.
94-
android:exported="false" />
95-
96-
<!-- Search widget -->
97-
+ <!--
98-
<receiver
99-
android:name="org.chromium.chrome.browser.searchwidget.SearchWidgetProvider"
100-
android:label="@string/search_widget_title"
101-
@@ -947,6 +964,7 @@ by a child template that "extends" this file.
102-
android:name="android.appwidget.provider"
103-
android:resource="@xml/search_widget_info" />
104-
</receiver>
105-
+ -->
106-
107-
<!-- Search Activity -->
108-
<activity android:name="org.chromium.chrome.browser.searchwidget.SearchActivity"
109-
@@ -1217,6 +1235,7 @@ by a child template that "extends" this file.
93+
@@ -1217,6 +1233,7 @@ by a child template that "extends" this file.
11094
</activity>
11195
{% endif %}
11296

0 commit comments

Comments
 (0)