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

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

Merge "Style and asset cleanup"

parents f1cc1295 0a1c6f02

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -390,8 +390,8 @@ package android { 
    field public static final int colorBackground = 16842801; // 0x1010031

    field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab

    field public static final int colorButtonNormal = 16843822; // 0x101042e

    field public static final int colorButtonPressed = 16843823; // 0x101042f

    field public static final int colorControlActivated = 16843821; // 0x101042d

    field public static final int colorControlHighlight = 16843823; // 0x101042f

    field public static final int colorControlNormal = 16843820; // 0x101042c

    field public static final int colorFocusedHighlight = 16843663; // 0x101038f

    field public static final int colorForeground = 16842800; // 0x1010030

core/res/res/color/btn_default_quantum_dark.xml

0 → 100644
+20 −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="0.5" android:color="@color/quantum_grey_700"/>

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

</selector>

core/res/res/color/btn_default_quantum_light.xml

0 → 100644
+20 −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="0.5" android:color="@color/quantum_grey_300"/>

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

</selector>

core/res/res/drawable/btn_borderless_quantum.xml

+18 −3
Original line number Diff line number Diff line
@@ -15,7 +15,22 @@ 
-->



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

    android:tint="?attr/colorButtonPressed">

    <item android:id="@id/mask"

        android:drawable="@drawable/btn_qntm_alpha" />

    android:tint="?attr/colorControlHighlight">

    <item android:id="@id/mask">

        <inset

            android:insetLeft="4dp"

            android:insetTop="4dp"

            android:insetBottom="4dp"

            android:insetRight="4dp">

            <shape android:shape="rectangle">

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

                <corners android:radius="2dp" />

                <padding

                    android:left="4dp"

                    android:top="4dp"

                    android:bottom="4dp"

                    android:right="4dp" />

            </shape>

        </inset>

    </item>

</ripple>

core/res/res/drawable/btn_cab_done_quantum.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android"

    android:autoMirrored="true">

    <item android:state_pressed="true">

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

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

    </item>

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

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

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

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

    </item>

    <item android:state_enabled="true">

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