chromium/src
0
Fork 0
Code Activity

Fix font and button drop shadow for button group

Browse Source 
The reason this didn't work as expected was that the style FilledButton.Tonal was not setup properly for ButtonCompat. As a result crrev.com/c/5818057 introduced a drop shadow to the buttons. The erroneous setup also caused TextAppearance to not be set as expected resulting in the wrong font (Roboto instead of Google Sans)

Bug: 369886259
Change-Id: I2023e37ba533d1039cbbeef30bafb2e4f0f05fbb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5952510
Auto-Submit: Florian Jacky <fjacky@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Theresa Sullivan <twellington@chromium.org>
Commit-Queue: Theresa Sullivan <twellington@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1373329}
This commit is contained in:
Florian Jacky
2024-10-24 15:12:45 +00:00
committed by Chromium LUCI CQ
parent 1f4d378d67
commit 7ccee0cea7
2 changed files with 13 additions and 10 deletions
components/browser_ui/modaldialog/android/java
res
values
styles.xml
src
org
chromium
components
browser_ui
modaldialog
ModalDialogView.java

15
components/browser_ui/modaldialog/android/java/res/values/styles.xml

@ -18,36 +18,39 @@ found in the LICENSE file.
<style name="ThemeOverlay.BrowserUI.ModalDialog" parent="Base.ThemeOverlay.BrowserUI.ModalDialog" />
<style name="FilledButton.Tonal">
<style name="FilledButton.Tonal.ButtonStyle" parent="">
<item name="android:textAppearance">@style/TextAppearance.Button.Text.Blue</item>
<item name="buttonColor">?attr/colorPrimaryContainer</item>
<item name="buttonTextColor">@macro/default_text_color_on_accent1_container</item>
<item name="verticalInset">@dimen/button_group_button_inset</item>
<item name="textAllCaps">false</item>
</style>
<style name="FilledButton.Tonal.SingleButton">
<style name="FilledButton.Tonal.ThemeOverlay" parent="FilledButton">
<item name="android:buttonStyle">@style/FilledButton.Tonal.ButtonStyle</item>
</style>
<style name="FilledButton.Tonal.ThemeOverlay.SingleButton">
<item name="rippleCornerRadiusTopStart">@dimen/button_group_large_radius</item>
<item name="rippleCornerRadiusTopEnd">@dimen/button_group_large_radius</item>
<item name="rippleCornerRadiusBottomEnd">@dimen/button_group_large_radius</item>
<item name="rippleCornerRadiusBottomStart">@dimen/button_group_large_radius</item>
</style>
<style name="FilledButton.Tonal.TopButton">
<style name="FilledButton.Tonal.ThemeOverlay.TopButton">
<item name="rippleCornerRadiusTopStart">@dimen/button_group_large_radius</item>
<item name="rippleCornerRadiusTopEnd">@dimen/button_group_large_radius</item>
<item name="rippleCornerRadiusBottomEnd">@dimen/button_group_small_radius</item>
<item name="rippleCornerRadiusBottomStart">@dimen/button_group_small_radius</item>
</style>
<style name="FilledButton.Tonal.MiddleButton">
<style name="FilledButton.Tonal.ThemeOverlay.MiddleButton">
<item name="rippleCornerRadiusTopStart">@dimen/button_group_small_radius</item>
<item name="rippleCornerRadiusTopEnd">@dimen/button_group_small_radius</item>
<item name="rippleCornerRadiusBottomEnd">@dimen/button_group_small_radius</item>
<item name="rippleCornerRadiusBottomStart">@dimen/button_group_small_radius</item>
</style>
<style name="FilledButton.Tonal.BottomButton">
<style name="FilledButton.Tonal.ThemeOverlay.BottomButton">
<item name="rippleCornerRadiusTopStart">@dimen/button_group_small_radius</item>
<item name="rippleCornerRadiusTopEnd">@dimen/button_group_small_radius</item>
<item name="rippleCornerRadiusBottomEnd">@dimen/button_group_large_radius</item>

8
components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/ModalDialogView.java

@ -373,14 +373,14 @@ public class ModalDialogView extends BoundedLinearLayout implements View.OnClick
ModalDialogProperties.ModalDialogButtonSpec spec = buttonSpecList[i];
int style = 0;
if (numButtons == 1) {
style = R.style.FilledButton_Tonal_SingleButton;
style = R.style.FilledButton_Tonal_ThemeOverlay_SingleButton;
} else {
if (i == 0) {
style = R.style.FilledButton_Tonal_TopButton;
style = R.style.FilledButton_Tonal_ThemeOverlay_TopButton;
} else if (i == numButtons - 1) {
style = R.style.FilledButton_Tonal_BottomButton;
style = R.style.FilledButton_Tonal_ThemeOverlay_BottomButton;
} else {
style = R.style.FilledButton_Tonal_MiddleButton;
style = R.style.FilledButton_Tonal_ThemeOverlay_MiddleButton;
}
}