From 8d62368706306cf4bc74cf29c527d5b98b43baaa Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Fri, 9 May 2014 16:44:56 -0700
Subject: Add touch feedback to Dialer buttons.

Now, on touch they'll have an yellow accent tint.

Change-Id: I8b13ec443185a8f18891997b7830d7c901578dea
---
 res/drawable/btn_call.xml               | 29 -----------------------------
 res/drawable/floating_action_button.xml | 16 +++++-----------
 res/layout/dialtacts_activity.xml       |  7 +++----
 res/values/colors.xml                   |  2 ++
 4 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 res/drawable/btn_call.xml

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>
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index d923cf369..595eae114 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -84,21 +84,20 @@
         android:layout_marginRight="@dimen/floating_action_button_margin_right"
         android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
         android:id="@+id/floating_action_button"
-        android:background="@drawable/fab_teal_background"
         android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true" >
+        android:layout_alignParentBottom="true">
         <ImageButton
             android:id="@+id/dialpad_button"
+            android:background="@drawable/floating_action_button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackground"
             android:contentDescription="@string/action_menu_dialpad_button"
             android:src="@drawable/fab_ic_dial"/>
         <ImageButton
             android:id="@+id/dial_button"
+            android:background="@drawable/floating_action_button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/btn_call"
             android:contentDescription="@string/description_dial_button"
             android:src="@drawable/fab_ic_call"
             android:visibility="gone" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 78e2301d2..8dc051a89 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,6 +19,8 @@
     <color name="dialtacts_primary_text_color">#000000</color>
     <!-- Secondary text color in the Dialer -->
     <color name="dialtacts_secondary_text_color">#888888</color>
+    <color name="dialer_accent_color">#eeff41</color>
+
 
     <!-- Color of the text describing an unconsumed missed call. -->
     <color name="call_log_missed_call_highlight_color">#FF0000</color>
-- 
cgit v1.2.3