Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine the ripple effect and text style of ActionPrimaryButton

Browse Source 
- The background color of the button is inverted, which has to be
  applied to inverse ripple colors.
- Update the font size and family.

Fixes: 190338973
Test: visual, manual
Change-Id: Ia7447b5e2f64546e0f011cca904d1317d6a38cf1
This commit is contained in:
Jason Chiu
2021-07-02 12:45:20 +08:00
parent baecf00ce2
commit 7b8eea386c
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_icon">#669df6</color>
<color name="biometric_enroll_intro_color_outline">#5e5e5e</color> <color name="biometric_enroll_intro_color_outline">#5e5e5e</color>
<color name="fingerprint_enrollment_finish_color_outline">#669df6</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> </resources>

3
res/values/colors.xml
View File

@@ -207,4 +207,7 @@
<!-- Fingerprint enrollment color --> <!-- Fingerprint enrollment color -->
<color name="fingerprint_enrollment_finish_color_outline">#1A73E8</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> </resources>

6
res/values/styles.xml
View File

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