From 01977452331daba9c00a57bb217c019cf87d1180 Mon Sep 17 00:00:00 2001 From: Serg Date: Mon, 30 Jan 2023 14:26:50 -0500 Subject: [PATCH] Fixes an Add Widget button on Android 8 devices --- android/brave_java_resources.gni | 5 +- .../promo/SearchWidgetPromoPanel.java | 12 ++-- .../java/res/drawable/add_widget_button.xml | 32 ++++++++++ .../res/layout/layout_search_widget_promo.xml | 63 ++++++++----------- android/java/res/values/brave_colors.xml | 3 +- 5 files changed, 66 insertions(+), 49 deletions(-) create mode 100644 android/java/res/drawable/add_widget_button.xml diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index a90063af4b4d..d7a187bfe682 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -395,9 +395,8 @@ brave_java_resources = [ "java/res/drawable-xxxhdpi/uphold_white.png", "java/res/drawable-xxxhdpi/verified_creator_large.png", "java/res/drawable-xxxhdpi/yandex.png", - "java/res/drawable//ic_circle_down.xml", - "java/res/drawable//ic_warning.xml", "java/res/drawable/ad_free_card_bg.xml", + "java/res/drawable/add_widget_button.xml", "java/res/drawable/ads_custom_notification_border.xml", "java/res/drawable/ads_custom_notification_border_dark.xml", "java/res/drawable/bat_ads_logo_button.xml", @@ -544,6 +543,7 @@ brave_java_resources = [ "java/res/drawable/ic_checkbox_filled.xml", "java/res/drawable/ic_checkbox_outline.xml", "java/res/drawable/ic_chevron_right.xml", + "java/res/drawable/ic_circle_down.xml", "java/res/drawable/ic_circle_news_settings.xml", "java/res/drawable/ic_clock.xml", "java/res/drawable/ic_close.xml", @@ -666,6 +666,7 @@ brave_java_resources = [ "java/res/drawable/ic_vpn_shield.xml", "java/res/drawable/ic_wallet_lock.xml", "java/res/drawable/ic_wallet_settings.xml", + "java/res/drawable/ic_warning.xml", "java/res/drawable/ic_warning_circle.xml", "java/res/drawable/ic_warning_circle_filled.xml", "java/res/drawable/ic_warning_red.xml", diff --git a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java index 04484aa0f764..89f151c9a143 100644 --- a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java +++ b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java @@ -2,7 +2,7 @@ Copyright (c) 2022 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/. */ package org.chromium.chrome.browser.widget.quickactionsearchandbookmark.promo; @@ -13,8 +13,6 @@ import android.widget.PopupWindow; import androidx.annotation.NonNull; -import androidx.appcompat.widget.AppCompatTextView; -import androidx.cardview.widget.CardView; import org.chromium.chrome.R; import org.chromium.chrome.browser.widget.quickactionsearchandbookmark.utils.BraveSearchWidgetUtils; @@ -24,10 +22,8 @@ public class SearchWidgetPromoPanel implements View.OnClickListener { public SearchWidgetPromoPanel(@NonNull Context context) { View view = View.inflate(context, R.layout.layout_search_widget_promo, null); - CardView cvAddWidget = view.findViewById(R.id.cvAddWidget); - AppCompatTextView tvNotNow = view.findViewById(R.id.tvNotNow); - cvAddWidget.setOnClickListener(this); - tvNotNow.setOnClickListener(this); + view.findViewById(R.id.btAddWidget).setOnClickListener(this); + view.findViewById(R.id.tvNotNow).setOnClickListener(this); int width = LinearLayout.LayoutParams.MATCH_PARENT; int height = LinearLayout.LayoutParams.WRAP_CONTENT; mPopupWindow = new PopupWindow(view, width, height, true); @@ -35,7 +31,7 @@ public SearchWidgetPromoPanel(@NonNull Context context) { @Override public void onClick(@NonNull View view) { - if (view.getId() == R.id.cvAddWidget) + if (view.getId() == R.id.btAddWidget) BraveSearchWidgetUtils.requestPinAppWidget(); else if (view.getId() == R.id.tvNotNow) BraveSearchWidgetUtils.setShouldShowWidgetPromo(false); diff --git a/android/java/res/drawable/add_widget_button.xml b/android/java/res/drawable/add_widget_button.xml new file mode 100644 index 000000000000..5cf4f87b325d --- /dev/null +++ b/android/java/res/drawable/add_widget_button.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/res/layout/layout_search_widget_promo.xml b/android/java/res/layout/layout_search_widget_promo.xml index 510bb3abf6e7..826191cc76d8 100644 --- a/android/java/res/layout/layout_search_widget_promo.xml +++ b/android/java/res/layout/layout_search_widget_promo.xml @@ -2,7 +2,7 @@ - - - - - + + - - - - + android:layout_weight="0.5" + android:gravity="center" + android:background="@drawable/add_widget_button" + android:text="@string/add_widget" + android:textAllCaps="false" + android:paddingHorizontal="16dp" + android:paddingVertical="10dp" + android:textColor="@color/search_widget_promo_add_widget_text_color" + android:fontFamily="sans-serif-medium" + app:drawableStartCompat="@drawable/ic_plus_add_widget" + android:drawablePadding="2dp" + style="?android:attr/borderlessButtonStyle"/> diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index 9782175a1617..1ae25cf05ffe 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -2,7 +2,7 @@ @@ -92,6 +92,7 @@ #fb542b @color/baseline_primary_200 #737ADE + #737ADE