diff --git a/android/BUILD.gn b/android/BUILD.gn index 9a9b1eec785f..52bf4c991b5d 100644 --- a/android/BUILD.gn +++ b/android/BUILD.gn @@ -196,7 +196,6 @@ android_resources("java_resources") { "java/brave-res/drawable/ad_free_card_bg.xml", "java/brave-res/drawable/add_custom_filter_button_background_disabled.xml", "java/brave-res/drawable/add_custom_filter_button_background_selector.xml", - "java/brave-res/drawable/add_widget_button.xml", "java/brave-res/drawable/ads_custom_notification_border.xml", "java/brave-res/drawable/ads_custom_notification_border_dark.xml", "java/brave-res/drawable/always_on_tab_dot.xml", @@ -254,6 +253,7 @@ android_resources("java_resources") { "java/brave-res/drawable/btn_right_tablet.xml", "java/brave-res/drawable/button_full.xml", "java/brave-res/drawable/button_outline.xml", + "java/brave-res/drawable/button_transparent.xml", "java/brave-res/drawable/card_bg.xml", "java/brave-res/drawable/circular_progress.xml", "java/brave-res/drawable/country_spinner_background.xml", @@ -400,7 +400,6 @@ android_resources("java_resources") { "java/brave-res/drawable/ic_rewards.xml", "java/brave-res/drawable/ic_rocket.xml", "java/brave-res/drawable/ic_search_21dp.xml", - "java/brave-res/drawable/ic_search_widget_promotion_icon.xml", "java/brave-res/drawable/ic_settings.xml", "java/brave-res/drawable/ic_settings_dapps.xml", "java/brave-res/drawable/ic_share.xml", @@ -431,7 +430,6 @@ android_resources("java_resources") { "java/brave-res/drawable/ic_warning_circle_filled.xml", "java/brave-res/drawable/ic_warning_circle_filled2.xml", "java/brave-res/drawable/ic_web.xml", - "java/brave-res/drawable/ic_widget_generic.xml", "java/brave-res/drawable/ic_widget_generic_with_container.xml", "java/brave-res/drawable/ic_youtube_skip_ads.xml", "java/brave-res/drawable/ic_zec_color.xml", @@ -486,6 +484,7 @@ android_resources("java_resources") { "java/brave-res/drawable/rounded_onboarding_welcome_bg.xml", "java/brave-res/drawable/rounded_set_default_top_corners.xml", "java/brave-res/drawable/rounded_shape.xml", + "java/brave-res/drawable/rounded_surface_container_background.xml", "java/brave-res/drawable/rounded_top_corners.xml", "java/brave-res/drawable/rounded_wallet_edittext.xml", "java/brave-res/drawable/selected_dot.xml", @@ -509,6 +508,7 @@ android_resources("java_resources") { "java/brave-res/drawable/warning_circle_filled.xml", "java/brave-res/drawable/web_notification_small_icon_background.xml", "java/brave-res/drawable/white_rounded_holo_button_thin.xml", + "java/brave-res/drawable/widget_promo_panel_search_background.xml", "java/brave-res/layout-land/activity_brave_leo_plans.xml", "java/brave-res/layout-land/activity_brave_origin_plans.xml", "java/brave-res/layout-land/activity_vpn_paywall.xml", @@ -703,6 +703,7 @@ android_resources("java_resources") { "java/brave-res/layout/web_notification_small_icon.xml", "java/brave-res/layout/widevine_permission_request_custom_view.xml", "java/brave-res/layout/widget_bookmark_grid_item.xml", + "java/brave-res/layout/widget_search_preview.xml", "java/brave-res/menu/bookmark_tab_menu.xml", "java/brave-res/menu/exit_settings_menu.xml", "java/brave-res/menu/menu_brave_news_settings_search.xml", diff --git a/android/java/brave-res/drawable/button_transparent.xml b/android/java/brave-res/drawable/button_transparent.xml new file mode 100644 index 000000000000..ed2fc1a7673f --- /dev/null +++ b/android/java/brave-res/drawable/button_transparent.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/brave-res/drawable/ic_search_widget_promotion_icon.xml b/android/java/brave-res/drawable/ic_search_widget_promotion_icon.xml deleted file mode 100644 index 6eca33af9054..000000000000 --- a/android/java/brave-res/drawable/ic_search_widget_promotion_icon.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/java/brave-res/drawable/ic_widget_generic.xml b/android/java/brave-res/drawable/ic_widget_generic.xml deleted file mode 100644 index 9dbf360e62e3..000000000000 --- a/android/java/brave-res/drawable/ic_widget_generic.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/android/java/brave-res/drawable/add_widget_button.xml b/android/java/brave-res/drawable/rounded_surface_container_background.xml similarity index 51% rename from android/java/brave-res/drawable/add_widget_button.xml rename to android/java/brave-res/drawable/rounded_surface_container_background.xml index 7c0f3b5798ca..ca9c8f50ea34 100644 --- a/android/java/brave-res/drawable/add_widget_button.xml +++ b/android/java/brave-res/drawable/rounded_surface_container_background.xml @@ -1,17 +1,11 @@ - - - - - - - + + + diff --git a/android/java/brave-res/drawable/widget_promo_panel_search_background.xml b/android/java/brave-res/drawable/widget_promo_panel_search_background.xml new file mode 100644 index 000000000000..f9bba64725da --- /dev/null +++ b/android/java/brave-res/drawable/widget_promo_panel_search_background.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/android/java/brave-res/layout/layout_search_widget_promo.xml b/android/java/brave-res/layout/layout_search_widget_promo.xml index ef957a2bde95..87bba749f38b 100644 --- a/android/java/brave-res/layout/layout_search_widget_promo.xml +++ b/android/java/brave-res/layout/layout_search_widget_promo.xml @@ -5,103 +5,81 @@ You can obtain one at https://mozilla.org/MPL/2.0/. --> - + app:cardCornerRadius="25dp" + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintWidth_max="380dp"> - + + - - - - - - - - - - + android:gravity="center" + android:layout_marginTop="16dp" + android:text="@string/try_brave_search_widget" + android:textColor="@color/text_primary"/> - + - + android:layout_marginEnd="2dp" + android:textColor="@color/schemes_on_surface_variant" /> - + android:layout_weight="0.5" + android:layout_marginStart="2dp" + android:text="@string/add_widget" /> - - + diff --git a/android/java/brave-res/layout/widget_search_preview.xml b/android/java/brave-res/layout/widget_search_preview.xml new file mode 100644 index 000000000000..12cd8fe97c1b --- /dev/null +++ b/android/java/brave-res/layout/widget_search_preview.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + diff --git a/android/java/brave-res/values/brave_styles.xml b/android/java/brave-res/values/brave_styles.xml index cc6c38659c60..1c5e1099fd52 100644 --- a/android/java/brave-res/values/brave_styles.xml +++ b/android/java/brave-res/values/brave_styles.xml @@ -478,7 +478,7 @@ @dimen/heading_h3 28sp normal - 500 + 600