Polish pad ripple colors

Bug: 15730223
Change-Id: I475ae3ba715ee39a580f58e98681b9884aad660c

10 files changed, 31 insertions, 3 deletions

diff --git a/res/drawable/pad_button_advanced_background.xml b/res/drawable/pad_button_advanced_background.xml
new file mode 100644
index 0000000..9cf0de9
--- /dev/null
+++ b/res/drawable/pad_button_advanced_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.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/pad_button_advanced_ripple_color" />
\ No newline at end of file
diff --git a/res/drawable/pad_btn_background.xml b/res/drawable/pad_button_background.xml
index b4861d0..b4861d0 100644
--- a/res/drawable/pad_btn_background.xml
+++ b/res/drawable/pad_button_background.xml
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index f0c08bb..f82c152 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -39,6 +39,7 @@
         <item name="android:layout_marginBottom">4dip</item>
         <item name="android:layout_marginStart">8dip</item>
         <item name="android:layout_marginEnd">8dip</item>
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">15sp</item>
     </style>
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index 98eba60..d2de4b5 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -38,6 +38,7 @@
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:layout_margin">4dip</item>
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">20sp</item>
     </style>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 7de1e8a..59a2af7 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -38,6 +38,7 @@
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:layout_margin">6dip</item>
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">27sp</item>
     </style>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index 3a4c188..9fd79f7 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -42,6 +42,7 @@
         <item name="android:layout_marginBottom">8dip</item>
         <item name="android:layout_marginStart">12dip</item>
         <item name="android:layout_marginEnd">12dip</item>
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">27sp</item>
     </style>
diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw800dp-land/styles.xml
index da69230..5e8e997 100644
--- a/res/values-sw800dp-land/styles.xml
+++ b/res/values-sw800dp-land/styles.xml
@@ -38,6 +38,7 @@
 
     <style name="PadButtonStyle.Advanced">
         <item name="android:layout_margin">6dip</item>
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">36sp</item>
     </style>
diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml
index 9b7475a..31e0d02 100644
--- a/res/values-sw800dp-port/styles.xml
+++ b/res/values-sw800dp-port/styles.xml
@@ -41,6 +41,7 @@
         <item name="android:layout_marginBottom">8dip</item>
         <item name="android:layout_marginStart">12dip</item>
         <item name="android:layout_marginEnd">12dip</item>
+        <item name="android:background">@drawable/pad_button_advanced_background</item>
         <item name="android:textColor">@color/pad_button_advanced_text_color</item>
         <item name="android:textSize">36sp</item>
     </style>
diff --git a/res/values/color.xml b/res/values/color.xml
index f7a68e7..b5ad418 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -48,6 +48,9 @@
     <color name="pad_button_advanced_text_color">#85000000</color>
 
     <!-- Ripple color when a button is pressed in a pad. -->
-    <color name="pad_button_ripple_color">#80FFFFFF</color>
+    <color name="pad_button_ripple_color">#33FFFFFF</color>
 
-</resources>
\ No newline at end of file
+    <!-- Ripple color when a button is pressed in a pad. -->
+    <color name="pad_button_advanced_ripple_color">#1a000000</color>
+
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 217df5d..1732b73 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,7 +35,7 @@
     <style name="PadButtonStyle" parent="@android:style/Widget.Material.Light.Button.Borderless">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/pad_btn_background</item>
+        <item name="android:background">@drawable/pad_button_background</item>
         <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:gravity">center</item>
         <item name="android:includeFontPadding">false</item>