From 7d7995e01ddf792b75e25ad2966b23a6442a644a Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 16 Jun 2015 15:20:00 -0700
Subject: [PATCH] Split control background into 40dp and 32dp diameter versions

Uses 32dp for seek bar.

Bug: 21848490
Change-Id: Ib1549f5217413f49f7e84aaeb12476b9315f9994
---
 .../control_background_32dp_material.xml      | 19 +++++++++++++++++++
 ...l => control_background_40dp_material.xml} |  2 +-
 core/res/res/values/styles_material.xml       | 16 ++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 core/res/res/drawable/control_background_32dp_material.xml
 rename core/res/res/drawable/{control_background_material.xml => control_background_40dp_material.xml} (93%)

diff --git a/core/res/res/drawable/control_background_32dp_material.xml b/core/res/res/drawable/control_background_32dp_material.xml
new file mode 100644
index 0000000000000..16287345f636a
--- /dev/null
+++ b/core/res/res/drawable/control_background_32dp_material.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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/control_highlight_material"
+        android:radius="16dp" />
diff --git a/core/res/res/drawable/control_background_material.xml b/core/res/res/drawable/control_background_40dp_material.xml
similarity index 93%
rename from core/res/res/drawable/control_background_material.xml
rename to core/res/res/drawable/control_background_40dp_material.xml
index 7b78349b2b9af..0e82ace0348ea 100644
--- a/core/res/res/drawable/control_background_material.xml
+++ b/core/res/res/drawable/control_background_40dp_material.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2015 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.
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 70f9c0269c46d..1b9c4091af355 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -574,16 +574,16 @@ please see styles_device_defaults.xml.
     <style name="Widget.Material.CompoundButton" parent="Widget.CompoundButton"/>
 
     <style name="Widget.Material.CompoundButton.CheckBox" parent="Widget.CompoundButton.CheckBox">
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
     </style>
 
     <style name="Widget.Material.CompoundButton.RadioButton" parent="Widget.CompoundButton.RadioButton">
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
     </style>
 
     <style name="Widget.Material.CompoundButton.Star" parent="Widget.CompoundButton.Star">
         <item name="button">@drawable/btn_star_material</item>
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
     </style>
 
     <style name="Widget.Material.CompoundButton.Switch">
@@ -592,7 +592,7 @@ please see styles_device_defaults.xml.
         <item name="switchTextAppearance">@style/TextAppearance.Material.Widget.Switch</item>
         <item name="textOn">@string/capital_on</item>
         <item name="textOff">@string/capital_off</item>
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
         <item name="showText">false</item>
     </style>
 
@@ -730,7 +730,7 @@ please see styles_device_defaults.xml.
         <item name="paddingStart">16dip</item>
         <item name="paddingEnd">16dip</item>
         <item name="mirrorForRtl">true</item>
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_32dp_material</item>
     </style>
 
     <style name="Widget.Material.RatingBar" parent="Widget.RatingBar">
@@ -812,7 +812,7 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="Widget.Material.Toolbar.Button.Navigation" parent="Widget.Material">
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
         <item name="minWidth">56dp</item>
         <item name="scaleType">center</item>
         <item name="paddingStart">@dimen/action_bar_navigation_padding_start_material</item>
@@ -869,7 +869,7 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="Widget.Material.ActionButton.CloseMode">
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
         <!-- Should match Widget.Material.Toolbar.Button.Navigation minWidth. -->
         <item name="minWidth">56dp</item>
     </style>
@@ -967,7 +967,7 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="Widget.Material.MediaRouteButton">
-        <item name="background">@drawable/control_background_material</item>
+        <item name="background">@drawable/control_background_40dp_material</item>
         <item name="externalRouteEnabledDrawable">@drawable/ic_media_route_material</item>
         <item name="minWidth">56dp</item>
         <item name="minHeight">48dp</item>