summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2016-08-11 17:39:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-08-11 17:40:02 +0000
commit348641d9728311de36a04cd6231f14a1a91596d9 (patch)
treebe3ff1b45ae119b458a3c6969fd3e104969e0900
parent53511e11960019029e6fce7631cf9d7b516358d5 (diff)
parent467658ddb2fdaeadd4b1537395ba5727b91a7dd5 (diff)
Merge "Use colorAccent for profile_button. am: ae01c57cb5 am: d4c31c0649" into nyc-mr1-dev-plus-aosp
-rw-r--r--core/res/res/layout/chooser_grid.xml2
-rw-r--r--core/res/res/layout/resolver_list.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml
index d12c8ba2f2ef..d8dd447e6a74 100644
--- a/core/res/res/layout/chooser_grid.xml
+++ b/core/res/res/layout/chooser_grid.xml
@@ -41,7 +41,7 @@
android:visibility="gone"
style="?attr/borderlessButtonStyle"
android:textAppearance="?attr/textAppearanceButton"
- android:textColor="@color/material_deep_teal_500"
+ android:textColor="?attr/colorAccent"
android:gravity="center_vertical"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml
index ae945031f11d..c4e8e9cb63bf 100644
--- a/core/res/res/layout/resolver_list.xml
+++ b/core/res/res/layout/resolver_list.xml
@@ -42,7 +42,7 @@
android:visibility="gone"
style="?attr/borderlessButtonStyle"
android:textAppearance="?attr/textAppearanceButton"
- android:textColor="@color/material_deep_teal_500"
+ android:textColor="?attr/colorAccent"
android:gravity="center_vertical"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"