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

Commit 5954383b authored by Alan Viverette's avatar Alan Viverette
Browse files

Various fixes for Material widget styles 

- Body1 text appearance in Material-styled NumberPicker
- Non-inverse text color in colored bordered button disabled state

Bug: 24374092
Bug: 24267929
Change-Id: I576af6171fc64ab821b6455d3b825c9b05eec4a7
parent 8f3976c8

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

+2 −1
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.
@@ -14,6 +14,7 @@ 
     limitations under the License.

-->



<!-- Used for tha background of a bordered colored button. -->

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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

core/res/res/color/btn_colored_borderless_text_material.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Used for the text of a borderless colored button. -->

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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

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

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

</selector>

core/res/res/color/btn_colored_text_material.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
     limitations under the License.

-->



<!-- Used for the text of a bordered colored button. -->

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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

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

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

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

</selector>

core/res/res/drawable/btn_colored_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <ripple android:color="?attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle"

                   android:tint="@color/btn_colored_material">

                   android:tint="@color/btn_colored_background_material">

                <corners android:radius="@dimen/control_corner_material" />

                <solid android:color="@color/white" />

                <padding android:left="@dimen/button_padding_horizontal_material"

core/res/res/layout/number_picker_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
      android:gravity="center"

      android:singleLine="true"

      android:background="@null"

      android:textAppearance="@style/TextAppearance.Material.Caption" />
 
      android:textAppearance="@style/TextAppearance.Material.Body1" />