From 355b6dde6fc341a1f537fb09c1bf4395d9cc06df Mon Sep 17 00:00:00 2001
From: Serg <serg.zhukovsky@gmail.com>
Date: Mon, 16 Jun 2025 08:52:14 -0400
Subject: [PATCH] Search widget: Set color scheme to use material design
 (#29569)

The search widget needs to have better alignment with Material colors.
It is important for it to feel like it is integrated to the OS.
Resolves: https://github.com/brave/brave-browser/issues/46537
---
 android/brave_java_resources.gni              |  2 -
 ..._search_and_bookmark_widget_background.xml |  5 --
 ...n_search_and_bookmark_widget_search_bg.xml |  5 --
 ...tion_search_and_bookmark_widget_layout.xml | 61 +++++++++++--------
 .../java/res/values-night/brave_colors.xml    |  4 +-
 android/java/res/values/brave_colors.xml      |  2 -
 android/java/res/values/brave_dimens.xml      |  3 +
 7 files changed, 38 insertions(+), 44 deletions(-)
 delete mode 100644 android/java/res/drawable/quick_action_search_and_bookmark_widget_background.xml
 delete mode 100644 android/java/res/drawable/quick_action_search_and_bookmark_widget_search_bg.xml

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index 3c8ea4c3b9c..12320778a77 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -600,9 +600,7 @@ brave_java_resources = [
   "java/res/drawable/progress_bar_weak.xml",
   "java/res/drawable/progress_bar_weak.xml",
   "java/res/drawable/progress_indeterminate_orange.xml",
-  "java/res/drawable/quick_action_search_and_bookmark_widget_background.xml",
   "java/res/drawable/quick_action_search_and_bookmark_widget_bookmark_bg.xml",
-  "java/res/drawable/quick_action_search_and_bookmark_widget_search_bg.xml",
   "java/res/drawable/rating_bottomsheet_background.xml",
   "java/res/drawable/rating_news_button_background.xml",
   "java/res/drawable/recovery_phrase_bg.xml",
diff --git a/android/java/res/drawable/quick_action_search_and_bookmark_widget_background.xml b/android/java/res/drawable/quick_action_search_and_bookmark_widget_background.xml
deleted file mode 100644
index 0cbd3862b38..00000000000
--- a/android/java/res/drawable/quick_action_search_and_bookmark_widget_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/quick_action_search_and_bookmark_widget_bg_color" />
-    <corners android:radius="24dp" />
-</shape>
\ No newline at end of file
diff --git a/android/java/res/drawable/quick_action_search_and_bookmark_widget_search_bg.xml b/android/java/res/drawable/quick_action_search_and_bookmark_widget_search_bg.xml
deleted file mode 100644
index 238d961cb1d..00000000000
--- a/android/java/res/drawable/quick_action_search_and_bookmark_widget_search_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/quick_action_search_and_bookmark_widget_search_bg_color" />
-    <corners android:radius="12dp" />
-</shape>
\ No newline at end of file
diff --git a/android/java/res/layout/quick_action_search_and_bookmark_widget_layout.xml b/android/java/res/layout/quick_action_search_and_bookmark_widget_layout.xml
index faea224cc4d..96a8dba5177 100644
--- a/android/java/res/layout/quick_action_search_and_bookmark_widget_layout.xml
+++ b/android/java/res/layout/quick_action_search_and_bookmark_widget_layout.xml
@@ -8,10 +8,13 @@
     android:id="@+id/background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/quick_action_search_and_bookmark_widget_background"
+    android:background="@drawable/quick_action_search_widget_background"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:paddingHorizontal="@dimen/quick_action_search_widget_small_margin"
+    android:paddingVertical=
+      "@dimen/quick_action_search_widget_small_margin_vertical"
+    android:theme="@style/Theme.Chromium.Widget" >
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,17 +24,24 @@
         <LinearLayout
             android:id="@+id/layoutSearchWithBrave"
             android:layout_width="0dp"
-            android:layout_height="44dp"
-            android:orientation="horizontal"
+            android:layout_height=
+              "@dimen/quick_action_search_widget_small_search_bar_height"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_button_horizontal_margin"
             android:layout_weight="1"
+            android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:background="@drawable/quick_action_search_and_bookmark_widget_search_bg"
+            android:background="@drawable/quick_action_search_widget_small_search_bar_background"
             tools:ignore="UseCompoundDrawables">
             
             <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="10dp"
+                android:layout_width=
+                  "@dimen/quick_action_search_widget_small_search_bar_icon_size"
+                android:layout_height=
+                  "@dimen/quick_action_search_widget_small_search_bar_icon_size"
+                android:layout_marginVertical="@dimen/quick_action_search_widget_small_search_bar_icon_margin"
+                android:layout_marginStart="@dimen/quick_action_search_widget_small_search_bar_icon_margin"
+                android:layout_marginEnd="@dimen/quick_action_search_widget_small_search_bar_icon_margin_text"
                 android:src="@mipmap/app_icon"
                 android:layout_gravity="center_vertical"
                 android:importantForAccessibility="no"/>
@@ -40,7 +50,6 @@
                 android:id="@+id/tvSearchWithBrave"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginStart="6dp"
                 android:gravity="center_vertical"
                 android:textSize="16sp"
                 android:text="@string/search_with_brave"
@@ -48,29 +57,19 @@
                 tools:ignore="UseCompatTextViewDrawableXml" />
         </LinearLayout>
 
-        <ImageView
+        <ImageButton
             android:id="@+id/ivVoiceSearch"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_marginStart="12dp"
-            android:background="@drawable/quick_action_search_and_bookmark_widget_search_bg"
+            style="@style/QuickActionSearchWidgetSmallButton"
+            android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_button_horizontal_margin"
             android:contentDescription="@string/accessibility_toolbar_btn_mic"
-            android:padding="12dp"
-            android:src="@drawable/btn_mic"
-            android:tint="@color/quick_action_search_and_bookmark_widget_tint"
-            tools:ignore="UseAppTint" />
+            android:src="@drawable/btn_mic"/>
 
-        <ImageView
+        <ImageButton
             android:id="@+id/ivIncognito"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_marginStart="12dp"
-            android:background="@drawable/quick_action_search_and_bookmark_widget_search_bg"
+            style="@style/QuickActionSearchWidgetSmallButton"
+            android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_button_horizontal_margin"
             android:contentDescription="@string/button_new_incognito_tab"
-            android:padding="12dp"
-            android:src="@drawable/brave_menu_new_private_tab"
-            android:tint="@color/quick_action_search_and_bookmark_widget_tint"
-            tools:ignore="UseAppTint" />
+            android:src="@drawable/brave_menu_new_private_tab"/>
     </LinearLayout>
 
     <LinearLayout
@@ -78,6 +77,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/quick_action_search_widget_small_search_bar_background_inset_vertical"
+        android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_search_bar_background_inset_horizontal"
         android:visibility="gone"
         android:orientation="horizontal">
 
@@ -206,6 +207,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/quick_action_search_widget_small_search_bar_background_inset_vertical"
+        android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_search_bar_background_inset_horizontal"
         android:visibility="gone"
         android:orientation="horizontal">
 
@@ -334,6 +337,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/quick_action_search_widget_small_search_bar_background_inset_vertical"
+        android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_search_bar_background_inset_horizontal"
         android:visibility="gone"
         android:orientation="horizontal">
 
@@ -462,6 +467,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/quick_action_search_widget_small_search_bar_background_inset_vertical"
+        android:layout_marginHorizontal="@dimen/quick_action_search_widget_small_search_bar_background_inset_horizontal"
         android:visibility="gone"
         android:orientation="horizontal">
 
diff --git a/android/java/res/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml
index 8cf9d5f9f93..0b1e9fb5a25 100644
--- a/android/java/res/values-night/brave_colors.xml
+++ b/android/java/res/values-night/brave_colors.xml
@@ -2,7 +2,7 @@
 <!-- Copyright (c) 2019 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 http://mozilla.org/MPL/2.0/
+     You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
 <resources>
@@ -170,8 +170,6 @@
     <color name="brave_wallet_dapp_text_color">@android:color/white</color>
 
     <!-- Quick Action Search and Bookmark Widget -->
-    <color name="quick_action_search_and_bookmark_widget_bg_color">#F21E2029</color>
-    <color name="quick_action_search_and_bookmark_widget_search_bg_color">#405E6175</color>
     <color name="quick_action_search_and_bookmark_widget_bookmark_bg_color">#FFFFFF</color>
     <color name="quick_action_search_and_bookmark_widget_tint">#F0F2FF</color>
     <color name="quick_action_search_and_bookmark_widget_text_color">#CED0DB</color>
diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml
index 025e592b76c..de2103e2b15 100644
--- a/android/java/res/values/brave_colors.xml
+++ b/android/java/res/values/brave_colors.xml
@@ -294,8 +294,6 @@
     <color name="vbat_warning_color">#FFD43B</color>
 
     <!-- Quick Action Search and Bookmark Widget -->
-    <color name="quick_action_search_and_bookmark_widget_bg_color">#F2FFFFFF</color>
-    <color name="quick_action_search_and_bookmark_widget_search_bg_color">#40AEB1C2</color>
     <color name="quick_action_search_and_bookmark_widget_bookmark_bg_color">#EEEFF1</color>
     <color name="quick_action_search_and_bookmark_widget_tint">#495057</color>
     <color name="quick_action_search_and_bookmark_widget_text_color">#495057</color>
diff --git a/android/java/res/values/brave_dimens.xml b/android/java/res/values/brave_dimens.xml
index 8020cd88680..e7276a5b515 100644
--- a/android/java/res/values/brave_dimens.xml
+++ b/android/java/res/values/brave_dimens.xml
@@ -95,4 +95,7 @@
     <dimen name="brave_news_category_group_title_phone_textsize">13sp</dimen>
     <dimen name="brave_news_category_group_desc_tablet_textsize">15sp</dimen>
     <dimen name="brave_news_category_group_desc_phone_textsize">11sp</dimen>
+
+    <!-- Quick Action Search Widget -->
+    <dimen name="quick_action_search_widget_small_margin_vertical">12dp</dimen>
 </resources>