Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8718963d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6e69fb82e1483ea6393540c1ca5888e12535be57
parents 60ce5798 74e14085

res/values-night/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

res/values/styles.xml

+4 −2
Original line number Diff line number Diff line
@@ -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">