summaryrefslogtreecommitdiffstats
path: root/core/res/res/color
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-06 10:22:30 -0800
committerAlan Viverette <alanv@google.com>2015-02-06 10:26:00 -0800
commit523ef90a7f92d99dffc30768b1d41a879169b0be (patch)
tree20d560c8677b627f476a401da272eac7b6e6c86d /core/res/res/color
parent0b1b82473d78b0887fe8b22d30812d0d2b7b6338 (diff)
downloadframeworks_base-523ef90a7f92d99dffc30768b1d41a879169b0be.zip
frameworks_base-523ef90a7f92d99dffc30768b1d41a879169b0be.tar.gz
frameworks_base-523ef90a7f92d99dffc30768b1d41a879169b0be.tar.bz2
Update colored button styling
Change-Id: Idf31a31cb2e049a6e2dc002271c560315b441dfc
Diffstat (limited to 'core/res/res/color')
-rw-r--r--core/res/res/color/btn_colored_material.xml (renamed from core/res/res/color/btn_material_accent.xml)2
-rw-r--r--core/res/res/color/btn_colored_text_material.xml22
2 files changed, 23 insertions, 1 deletions
diff --git a/core/res/res/color/btn_material_accent.xml b/core/res/res/color/btn_colored_material.xml
index 71469b6..b45f824 100644
--- a/core/res/res/color/btn_material_accent.xml
+++ b/core/res/res/color/btn_colored_material.xml
@@ -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>
diff --git a/core/res/res/color/btn_colored_text_material.xml b/core/res/res/color/btn_colored_text_material.xml
new file mode 100644
index 0000000..950d04a
--- /dev/null
+++ b/core/res/res/color/btn_colored_text_material.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<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>