Rename some attributes in ui/android resources to avoid name conflicts.
When merging with downstream builds that also depend on the Material library, we can get name conflicts. Apparently, although resource names are namespaced, attribute names are not. Bug: 414882662 Test: build cast receiver against cast_browser_dist_aar Change-Id: Iab480a92b910178e0bb5588b41346e093bacf96a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6503856 Reviewed-by: Wenyu Fu <wenyufu@chromium.org> Commit-Queue: Simeon Anfinrud <sanfin@chromium.org> Cr-Commit-Position: refs/heads/main@{#1455094}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
d32a54fe7b
commit
ffb8f19647
chrome/browser/creator/android/java/res/values
ui/android/java
@ -24,7 +24,7 @@ found in the LICENSE file.
|
||||
<item name="buttonTextColor">@macro/default_text_color_accent1</item>
|
||||
<item name="buttonColor">@android:color/transparent</item>
|
||||
<item name="rippleColor">@color/text_button_ripple_color_list</item>
|
||||
<item name="borderWidth">@dimen/button_outlined_border_width</item>
|
||||
<item name="buttonBorderWidth">@dimen/button_outlined_border_width</item>
|
||||
<item name="borderColor">?attr/globalOutlinedButtonBorderColor</item>
|
||||
</style>
|
||||
|
||||
|
@ -18,7 +18,7 @@ found in the LICENSE file.
|
||||
<attr name="buttonTextColor" format="reference"/>
|
||||
<attr name="rippleColor"/>
|
||||
<attr name="borderColor" format="color"/>
|
||||
<attr name="borderWidth" format="reference|dimension"/>
|
||||
<attr name="buttonBorderWidth" format="reference|dimension"/>
|
||||
<!-- The vertical inset of the button background drawable. -->
|
||||
<attr name="verticalInset"/>
|
||||
|
||||
|
@ -53,7 +53,7 @@ found in the LICENSE file.
|
||||
<item name="rippleColor">?attr/globalTextButtonRippleColor</item>
|
||||
</style>
|
||||
<style name="OutlinedButton" parent="TextButton" tools:ignore="UnusedResources">
|
||||
<item name="borderWidth">@dimen/button_outlined_border_width</item>
|
||||
<item name="buttonBorderWidth">@dimen/button_outlined_border_width</item>
|
||||
<item name="borderColor">?attr/globalOutlinedButtonBorderColor</item>
|
||||
</style>
|
||||
<style name="FilledTonalButton" parent="TextButton" tools:ignore="UnusedResources">
|
||||
|
@ -89,7 +89,7 @@ public class ButtonCompat extends AppCompatButton {
|
||||
a.getResourceId(R.styleable.ButtonCompat_borderColor, android.R.color.transparent);
|
||||
int borderWidthId =
|
||||
a.getResourceId(
|
||||
R.styleable.ButtonCompat_borderWidth,
|
||||
R.styleable.ButtonCompat_buttonBorderWidth,
|
||||
R.dimen.default_ripple_background_border_size);
|
||||
int verticalInset =
|
||||
a.getDimensionPixelSize(
|
||||
|
Reference in New Issue
Block a user