summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--res/drawable/action_button_background.xml27
-rw-r--r--res/drawable/call_log_background.xml19
-rw-r--r--res/layout/call_log_list_item.xml1
-rw-r--r--res/layout/call_log_list_item_actions.xml3
4 files changed, 50 insertions, 0 deletions
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml
new file mode 100644
index 000000000..895bda147
--- /dev/null
+++ b/res/drawable/action_button_background.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="?android:attr/colorButtonPressed"
+ 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. -->
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@android:color/transparent" />
+ </shape>
+ </item>
+</touch-feedback>
diff --git a/res/drawable/call_log_background.xml b/res/drawable/call_log_background.xml
new file mode 100644
index 000000000..92299f0ff
--- /dev/null
+++ b/res/drawable/call_log_background.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="?android:attr/colorButtonPressed"
+ android:pinned="false" />
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index b7e969693..63436b599 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -46,6 +46,7 @@
<!-- Primary area containing the contact badge and caller information -->
<LinearLayout
android:id="@+id/primary_action_view"
+ android:background="@drawable/call_log_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index 733786322..eb4aea282 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -30,6 +30,7 @@
>
<TextView
android:id="@+id/call_back_action"
+ android:background="@drawable/action_button_background"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:layout_width="wrap_content"
@@ -44,6 +45,7 @@
android:focusable="true"/>
<TextView
android:id="@+id/voicemail_action"
+ android:background="@drawable/action_button_background"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:layout_width="wrap_content"
@@ -58,6 +60,7 @@
android:focusable="true"/>
<TextView
android:id="@+id/delete_action"
+ android:background="@drawable/action_button_background"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:layout_width="wrap_content"