xiaoyan159/Android14Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: SettingsLib剩余AudioAttributes引用等待处理

Browse Source
This commit is contained in:
xiaoyan159@6800H
2024-12-10 10:27:23 +08:00
parent 579bbe730f
commit ad8fc8731d
19 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SettingsLib/res/drawable/broadcast_dialog_btn_bg.xml
View File

@@ -18,6 +18,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="?androidprv:attr/colorAccentPrimary" />
<solid android:color="?attr/colorAccentPrimary" />
<corners android:radius="@dimen/broadcast_dialog_btn_radius" />
</shape>

2
SettingsLib/res/drawable/dialog_btn_filled.xml
View File

@@ -28,7 +28,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_corner_radius"/>
<solid android:color="?androidprv:attr/colorAccentPrimary"/>
<solid android:color="?attr/colorAccentPrimary"/>
<padding android:left="@dimen/dialog_button_horizontal_padding"
android:top="@dimen/dialog_button_vertical_padding"
android:right="@dimen/dialog_button_horizontal_padding"

2
SettingsLib/res/drawable/dialog_btn_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_corner_radius"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
<stroke android:color="?attr/colorAccentPrimaryVariant"
android:width="1dp"/>
<padding android:left="@dimen/dialog_button_horizontal_padding"
android:top="@dimen/dialog_button_vertical_padding"

4
SettingsLib/res/values/attrs.xml
View File

@@ -50,4 +50,8 @@
<attr name="preferenceStyle" format="reference" />
<attr name="switchPreferenceStyle" format="reference" />
<!-- 自己添加的资源引用 -->
<attr name="textColorOnAccent" format="color" />
<attr name="colorAccentPrimaryVariant" format="color" />
<attr name="colorAccentPrimary" format="color" />
</resources>

4
SettingsLib/res/values/styles.xml
View File

@@ -74,7 +74,7 @@
</style>
<style name="TextAppearanceBroadcastDialogButton" parent="@android:TextAppearance.DeviceDefault.Headline">
<item name="android:textColor">?androidprv:attr/textColorOnAccent</item>
<item name="android:textColor">?attr/textColorOnAccent</item>
<item name="android:textSize">@dimen/broadcast_dialog_btn_text_size</item>
</style>
@@ -94,7 +94,7 @@
<style name="DialogButtonPositive">
<item name="android:background">@drawable/dialog_btn_filled</item>
<item name="android:textColor">?androidprv:attr/textColorOnAccent</item>
<item name="android:textColor">?attr/textColorOnAccent</item>
<item name="android:textSize">14sp</item>
<item name="android:lineHeight">20sp</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>