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

Commit d525762a authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Update colored button styling"

parents a7e8717e 523ef90a

core/res/res/color/btn_material_accent.xml→core/res/res/color/btn_colored_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:color="@color/button_material_dark" />

          android:color="?attr/colorButtonNormal" />

    <item android:color="?attr/colorAccent" />

</selector>

core/res/res/anim/disabled_anim_material.xml→core/res/res/color/btn_colored_text_material.xml

+7 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -13,21 +13,10 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false">

        <set>

            <objectAnimator android:propertyName="alpha"

                android:duration="@integer/disabled_alpha_animation_duration"

                android:valueTo="?attr/disabledAlpha"

                android:valueType="floatType"/>

        </set>

    </item>

    <item>

        <set>

            <objectAnimator android:propertyName="alpha"

                android:duration="@integer/disabled_alpha_animation_duration"

                android:valueTo="1"

                android:valueType="floatType"/>

        </set>

    </item>

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:color="?attr/textColorSecondary" />

    <item android:color="?attr/colorAccent"/>

</selector>

core/res/res/values/styles_material.xml

+2 −3
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ please see styles_device_defaults.xml. 


    <!-- Colored bordered ink button -->

    <style name="Widget.Material.Button.Colored">

        <item name="backgroundTint">@color/btn_material_accent</item>

        <item name="backgroundTint">@color/btn_colored_material</item>

    </style>



    <!-- Small bordered ink button -->
@@ -481,8 +481,7 @@ please see styles_device_defaults.xml. 


    <!-- Colored borderless ink button -->

    <style name="Widget.Material.Button.Borderless.Colored">

        <item name="textColor">?attr/colorAccent</item>

        <item name="stateListAnimator">@anim/disabled_anim_material</item>

        <item name="textColor">@color/btn_colored_text_material</item>

    </style>



    <!-- Alert dialog button bar button -->