am 41d36870: Merge "Specify dialpad touch tint color in style." into lmp-preview-dev

* commit '41d3687031552f67975ec6b647da7c4ea20762cc':
  Specify dialpad touch tint color in style.

4 files changed, 3 insertions, 21 deletions

diff --git a/InCallUI/res/drawable/incall_dialpad_key_colors.xml b/InCallUI/res/drawable/incall_dialpad_key_colors.xml
deleted file mode 100644
index 8c8da0b24..000000000
--- a/InCallUI/res/drawable/incall_dialpad_key_colors.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@color/incall_dialpad_background_pressed" />
-</selector>
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 57264f72e..e740b8428 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -81,4 +81,6 @@
     <color name="glowpad_incoming_widget_tint">#a3a3a3</color>
     <color name="glowpad_incoming_widget_background_tint">#ffffff</color>
 
+    <!-- 15% opacity, accent color. -->
+    <color name="incall_dialpad_touch_tint">#26eeff41</color>
 </resources>
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index a910763dc..7b305ec45 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -122,6 +122,7 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
     </style>
 
     <style name="PrimaryCallInfoPrimaryCallBanner">
diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index 83484648a..f36e25bc9 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -544,7 +544,6 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
         DialpadKeyButton dialpadKey;
         for (int i = 0; i < buttonIds.length; i++) {
             dialpadKey = (DialpadKeyButton) fragmentView.findViewById(buttonIds[i]);
-            dialpadKey.setBackgroundResource(R.drawable.incall_dialpad_key_colors);
             dialpadKey.setOnTouchListener(this);
             dialpadKey.setOnKeyListener(this);
             dialpadKey.setOnHoverListener(this);