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

Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: I8ab31b8c9d3be312c0500d036ef6e406c2f3c301
This commit is contained in:
TreeHugger Robot
2021-07-02 11:15:33 +00:00
committed by Automerger Merge Worker
parent 82b4b46b4f 74e1408513
commit 0fc4491c09
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values-night/colors.xml
View File

@@ -49,5 +49,8 @@
<color name="biometric_enroll_intro_color_icon">#669df6</color>
<color name="biometric_enroll_intro_color_outline">#5e5e5e</color>
<color name="fingerprint_enrollment_finish_color_outline">#669df6</color>
<!-- Material inverse ripple color, useful for inverted backgrounds. -->
<color name="ripple_material_inverse">@*android:color/ripple_material_light</color>
</resources>

3
res/values/colors.xml
View File

@@ -207,4 +207,7 @@
<!-- Fingerprint enrollment color -->
<color name="fingerprint_enrollment_finish_color_outline">#1A73E8</color>
<!-- Material inverse ripple color, useful for inverted backgrounds. -->
<color name="ripple_material_inverse">@*android:color/ripple_material_dark</color>
</resources>

6
res/values/styles.xml
View File

@@ -422,13 +422,15 @@
<style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored">
<item name="android:theme">@style/RoundedCornerThemeOverlay</item>
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
</style>
<style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
<style name="RoundedCornerThemeOverlay">
<item name="android:buttonCornerRadius">24dp</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:paddingHorizontal">16dp</item>
<item name="android:colorControlHighlight">@color/ripple_material_inverse</item>
</style>
<style name="LockPatternContainerStyle">