owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
sk
2022-12-16 02:24:01 +01:00
parent ed1d9165e1 e0febda372
commit 9a47530ab8
46 changed files with 1541 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/res/values/attrs.xml
View File

@@ -59,6 +59,10 @@
<attr name="colorM3Outline" format="color"/>
<attr name="colorM3DisabledBackground" format="color"/>
<attr name="colorM3PressedOverlay" format="color"/>
<attr name="colorM3Error" format="color"/>
<attr name="colorM3OnError" format="color"/>
<attr name="colorM3ErrorContainer" format="color"/>
<attr name="colorM3OnErrorContainer" format="color"/>
<attr name="primaryLargeButtonStyle" format="reference"/>
<attr name="secondaryLargeButtonStyle" format="reference"/>
@@ -70,5 +74,6 @@
<declare-styleable name="FloatingHintEditTextLayout">
<attr name="editTextOffsetY" format="dimension"/>
<attr name="android:labelTextSize" format="dimension"/>
<attr name="labelTextColor" format="color"/>
</declare-styleable>
</resources>