diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-22 01:11:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 01:11:50 +0000 |
| commit | c04d59848a84f6e2f1288cbed67585adef2a9c4f (patch) | |
| tree | fb4c36edfc1fd105794afe08743d95d34b2a5a25 /res | |
| parent | 3b8e22ea2f6fa7d407942833099de8a83c0f4774 (diff) | |
| parent | bcab5c484efde6a2b2fd6c01ee1c51a1695b5fe3 (diff) | |
Merge "Update highlight attribute"
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/action_button_background.xml | 2 | ||||
| -rw-r--r-- | res/drawable/call_log_background.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml index 40b47e376..fd5bc6123 100644 --- a/res/drawable/action_button_background.xml +++ b/res/drawable/action_button_background.xml @@ -15,7 +15,7 @@ limitations under the License. --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="?android:attr/colorButtonPressed" + android:tint="?android:attr/colorControlHighlight" android:pinned="true"> <!-- Transparent background constrains the touch feedback ripple to the button, but also allows touch feedback ripples in the parent to show under the button. --> diff --git a/res/drawable/call_log_background.xml b/res/drawable/call_log_background.xml index 166907a22..c0c488902 100644 --- a/res/drawable/call_log_background.xml +++ b/res/drawable/call_log_background.xml @@ -15,5 +15,5 @@ limitations under the License. --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="?android:attr/colorButtonPressed" + android:tint="?android:attr/colorControlHighlight" android:pinned="false" /> |