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

Commit 26c184b7 authored by Alan Viverette's avatar Alan Viverette
Browse files

Update drawables for themeable color state list and layer-list gravity 

Removes some unused resources and replaces some 9-patches with XML.

Change-Id: Id49a2b715d7a10bf5eeb146062d20a42487334e1
parent 0d89d3f0

core/res/res/color/btn_default_material_dark.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="@dimen/disabled_alpha_material_dark"

          android:alpha="?attr/disabledAlpha"

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

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

</selector>

core/res/res/color/btn_default_material_light.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <item android:state_enabled="false"

          android:alpha="@dimen/disabled_alpha_material_light"

          android:alpha="?attr/disabledAlpha"

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

    <item android:color="@color/button_material_light"/>

</selector>

core/res/res/drawable/btn_cab_done_material.xml→core/res/res/color/control_checkable_material.xml

+8 −15
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.
@@ -15,17 +14,11 @@ 
     limitations under the License.

-->



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

    android:autoMirrored="true">

    <item android:state_pressed="true">

        <color android:color="?attr/colorControlHighlight" />

    </item>

    <item android:state_focused="true" android:state_enabled="true">

        <nine-patch android:src="@drawable/btn_cab_done_mtrl_alpha"

            android:tint="?attr/colorControlHighlight" />

    </item>

    <item android:state_enabled="true">

        <nine-patch android:src="@drawable/btn_cab_done_mtrl_alpha"

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

    </item>

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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

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

    <item android:state_checked="true"

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

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

</selector>

core/res/res/color/control_default_material.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

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

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

</selector>

core/res/res/color/switch_track_material.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    <item android:state_enabled="false"

          android:color="?attr/colorForeground"

          android:alpha="?attr/disabledAlpha" />

    <item android:state_checked="true"

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

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

</selector>