diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-10-15 18:12:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-15 18:12:14 +0000 |
| commit | 98372fb9484e178c945d5723e7e0f0206da1526f (patch) | |
| tree | 0cc532858bcb45bd207a810ffe955167a9fbecdb | |
| parent | 17cff268dc69b64b0d42c8336c0bd55ac3b76c1b (diff) | |
| parent | fe919b3eea7a40cedd55b60a454cc1a2ee26e381 (diff) | |
am fe919b3e: am f59b9193: Merge "Add touch feedback to action buttons" into lmp-mr1-dev
* commit 'fe919b3eea7a40cedd55b60a454cc1a2ee26e381':
Add touch feedback to action buttons
| -rw-r--r-- | res/drawable/action_button_background.xml | 26 | ||||
| -rw-r--r-- | res/layout/call_log_list_item_actions.xml | 10 |
2 files changed, 5 insertions, 31 deletions
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml deleted file mode 100644 index ea7434f24..000000000 --- a/res/drawable/action_button_background.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight"> - <!-- Transparent background constrains the touch feedback ripple to the button, but also allows - touch feedback ripples in the parent to show under the button. --> - <item> - <shape android:shape="rectangle" > - <solid android:color="@android:color/transparent" /> - </shape> - </item> -</ripple> diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml index ac83f4ac8..1280089f5 100644 --- a/res/layout/call_log_list_item_actions.xml +++ b/res/layout/call_log_list_item_actions.xml @@ -30,7 +30,7 @@ > <TextView android:id="@+id/call_back_action" - android:background="@drawable/action_button_background" + android:background="?android:attr/selectableItemBackground" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -46,7 +46,7 @@ android:singleLine="true"/> <TextView android:id="@+id/video_call_action" - android:background="@drawable/action_button_background" + android:background="?android:attr/selectableItemBackground" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -62,7 +62,7 @@ android:singleLine="true"/> <TextView android:id="@+id/voicemail_action" - android:background="@drawable/action_button_background" + android:background="?android:attr/selectableItemBackground" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -78,7 +78,7 @@ android:singleLine="true"/> <TextView android:id="@+id/details_action" - android:background="@drawable/action_button_background" + android:background="?android:attr/selectableItemBackground" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -94,7 +94,7 @@ android:singleLine="true"/> <TextView android:id="@+id/report_action" - android:background="@drawable/action_button_background" + android:background="?android:attr/selectableItemBackground" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" |