fix: 处理引用依赖问题

This commit is contained in:
2024-12-11 15:28:11 +08:00
parent df105485bd
commit 8454e55c4b
246 changed files with 14884 additions and 100 deletions

View File

@@ -203,4 +203,37 @@
<declare-styleable name="BackgroundPreference">
<attr name="background" format="reference" />
</declare-styleable>
<!-- 缺少元素补充 -->
<attr name="materialColorSurfaceBright" format="color" />
<attr name="materialColorSurfaceContainerHigh" format="color" />
<attr name="materialColorSurfaceContainer" format="color" />
<attr name="materialColorOutlineVariant" format="color" />
<attr name="materialColorOnSurfaceVariant" format="color" />
<attr name="materialColorSecondaryContainer" format="color" />
<attr name="materialColorOnSecondaryContainer" format="color" />
<attr name="materialColorPrimaryContainer" format="color" />
<attr name="materialColorOnPrimaryContainer" format="color" />
<attr name="materialColorPrimary" format="color" />
<attr name="materialColorOnSurface" format="color" />
<attr name="materialColorSurfaceContainerHighest" format="color" />
<attr name="materialColorSecondary" format="color" />
<attr name="materialColorTertiaryContainer" format="color" />
<attr name="materialColorSurfaceContainerLow" format="color" />
<attr name="materialColorOnTertiaryContainer" format="color" />
<attr name="materialColorOnPrimary" format="color" />
<attr name="materialColorSurface" format="color" />
<attr name="textColorPrimary" format="color" />
<attr name="titleItemStartPadding" format="dimension" />
<attr name="contentStartPadding" format="dimension" />
<attr name="contentEndPadding" format="dimension" />
<attr name="endItemStartPadding" format="dimension" />
<attr name="endItemEndPadding" format="dimension" />
<attr name="bottomDividerStartPadding" format="dimension" />
<attr name="bottomDividerEndPadding" format="dimension" />
<attr name="actionDividerHeight" format="dimension" />
<attr name="titleSize" format="dimension" />
</resources>

View File

@@ -94,7 +94,7 @@
<color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
<!-- Search bar background color -->
<color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
<color name="search_bar_background">?attr/materialColorSurfaceBright</color>
<color name="face_enroll_icon_color">#42a5f5</color> <!-- Blue 400 -->
@@ -166,7 +166,7 @@
<color name="battery_info_error_color_black">@*android:color/primary_text_default_material_light</color>
<!-- Background for multiple user settings page avatars -->
<color name="user_avatar_color_bg">?androidprv:attr/materialColorSurfaceContainer</color>
<color name="user_avatar_color_bg">?attr/materialColorSurfaceContainer</color>
<!-- Icon tint color for battery usage system icon -->
<color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>

View File

@@ -13,7 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<resources
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Strings for Dialog yes button -->
<string name="yes">"Yes"</string>
<!-- Strings for Dialog no button -->

View File

@@ -448,7 +448,7 @@
<item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
<item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
<item name="cardBackgroundColor">?androidprv:attr/materialColorSurfaceContainer</item>
<item name="cardBackgroundColor">?attr/materialColorSurfaceContainer</item>
<item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
<item name="cardElevation">0dp</item>
<item name="rippleColor">?android:attr/colorControlHighlight</item>

View File

@@ -67,12 +67,12 @@
<item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
<item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
<item name="notification_importance_button_border_color_unselected">?androidprv:attr/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="notification_importance_button_border_color_unselected">?attr/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">?attr/materialColorOnSurfaceVariant</item>
<item name="notification_importance_button_background_color_selected">?androidprv:attr/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_background_color_selected">?attr/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">?attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">?attr/materialColorOnSecondaryContainer</item>
</style>
<!-- Variant of the settings theme with no action bar. -->