summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-09 16:44:56 -0700
committerAndrew Lee <anwlee@google.com>2014-05-09 16:45:37 -0700
commit8d62368706306cf4bc74cf29c527d5b98b43baaa (patch)
tree5b057073cf86d813f169a8240d6c0d2f02baf230 /res/drawable
parentcb87764d483d25ee988616e8a708685901509cfa (diff)
downloadandroid_packages_apps_Dialer-8d62368706306cf4bc74cf29c527d5b98b43baaa.tar.gz
android_packages_apps_Dialer-8d62368706306cf4bc74cf29c527d5b98b43baaa.tar.bz2
android_packages_apps_Dialer-8d62368706306cf4bc74cf29c527d5b98b43baaa.zip
Add touch feedback to Dialer buttons.
Now, on touch they'll have an yellow accent tint. Change-Id: I8b13ec443185a8f18891997b7830d7c901578dea
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/btn_call.xml29
-rw-r--r--res/drawable/floating_action_button.xml16
2 files changed, 5 insertions, 40 deletions
diff --git a/res/drawable/btn_call.xml b/res/drawable/btn_call.xml
deleted file mode 100644
index ae2f6c0c4..000000000
--- a/res/drawable/btn_call.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Background resource for call button in the various dialpads.
- Almost a copy from framework's item_background_holo_dark.xml, but has different pressed effect
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
-
- <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
- <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
- <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_disabled_holo_dark" />
- <item android:state_focused="true" android:drawable="@drawable/list_focused_holo" />
- <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index 2f77232bb..ea9549054 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -15,14 +15,8 @@
limitations under the License.
-->
-<shape
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="oval" >
- <corners
- android:radius="@dimen/floating_action_button_radius" />
- <size
- android:width="@dimen/floating_action_button_width"
- android:height="@dimen/floating_action_button_height" />
- <solid
- android:color="@color/actionbar_background_color" />
-</shape> \ No newline at end of file
+<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@color/dialer_accent_color"
+ android:pinned="true">
+ <item android:drawable="@drawable/fab_teal_background" />
+</touch-feedback>