PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev

Browse Source
This commit is contained in:
Marcelo Arteiro
2023-03-10 13:43:23 +00:00
committed by Android (Google) Code Review
parent 3eb30fb31c 1b599e0232
commit 7e2d77a717
29 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/colors.xml
View File

@@ -98,7 +98,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">?androidprv:attr/colorSurfaceHighlight</color>
<color name="face_enroll_icon_color">#42a5f5</color> <!-- Blue 400 -->
@@ -168,7 +168,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">?androidprv:attr/colorSurface</color>
<!-- Icon tint color for battery usage system icon -->
<color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>

2
res/values/styles.xml
View File

@@ -435,7 +435,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">?androidprv:attr/colorSurface</item>
<item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
<item name="cardElevation">0dp</item>
<item name="rippleColor">?android:attr/colorControlHighlight</item>