commit 3f11548e3944b2d279c999d6ab0a95c63f5c0aa7
author Qiwen Zhao <zhao@google.com> Fri Sep 12 08:50:12 2014 -0700
committer Qiwen Zhao <zhao@google.com> Fri Sep 12 08:50:12 2014 -0700
tree 7e55284bf63d1178f24096cec7a653ee955a5c6c
parent dec7a2f48731950340aafa6649bd16c89c2dda56

DO NOT MERGE - Update prebuilt SDK to LSW74

current/support/v7/appcompat/res/values-v21/themes_base.xml

diff --git a/current/support/v7/appcompat/res/values-v21/themes_base.xml b/current/support/v7/appcompat/res/values-v21/themes_base.xml
index 57cc258..f69aed7 100644
--- a/current/support/v7/appcompat/res/values-v21/themes_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/themes_base.xml
@@ -81,7 +81,6 @@
         <item name="android:colorControlNormal">?attr/colorControlNormal</item>
         <item name="android:colorControlActivated">?attr/colorControlActivated</item>
         <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
-        <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
     </style>
 
     <style name="Base.V21.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light">
@@ -118,7 +117,6 @@
         <item name="android:colorControlNormal">?attr/colorControlNormal</item>
         <item name="android:colorControlActivated">?attr/colorControlActivated</item>
         <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
-        <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
     </style>
 
     <style name="Base.V21.Theme.AppCompat.Dialog" parent="Base.V11.Theme.AppCompat.Dialog">
@@ -155,7 +153,6 @@
         <item name="android:colorControlNormal">?attr/colorControlNormal</item>
         <item name="android:colorControlActivated">?attr/colorControlActivated</item>
         <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
-        <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
     </style>
 
     <style name="Base.V21.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog">
@@ -192,7 +189,6 @@
         <item name="android:colorControlNormal">?attr/colorControlNormal</item>
         <item name="android:colorControlActivated">?attr/colorControlActivated</item>
         <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
-        <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
     </style>
 
     <style name="Base.Theme.AppCompat.Dialog" parent="Base.V21.Theme.AppCompat.Dialog" />
@@ -205,6 +201,10 @@
     <style name="Base.ThemeOverlay.AppCompat.Dark" parent="android:ThemeOverlay.Material.Dark">
         <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item>
 
+        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
+        <item name="colorControlActivated">?android:attr/colorControlActivated</item>
+        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+
         <!-- Used by MediaRouter -->
         <item name="isLightTheme">false</item>
     </style>
@@ -212,16 +212,27 @@
     <style name="Base.ThemeOverlay.AppCompat.Light" parent="android:ThemeOverlay.Material.Light">
         <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item>
 
+        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
+        <item name="colorControlActivated">?android:attr/colorControlActivated</item>
+        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+
         <!-- Used by MediaRouter -->
         <item name="isLightTheme">true</item>
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat.ActionBar" parent="android:ThemeOverlay.Material.ActionBar">
+        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
+        <item name="colorControlActivated">?android:attr/colorControlActivated</item>
+        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" parent="android:ThemeOverlay.Material.Dark.ActionBar">
         <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item>
 
+        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
+        <item name="colorControlActivated">?android:attr/colorControlActivated</item>
+        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+
         <!-- Used by MediaRouter -->
         <item name="isLightTheme">false</item>
     </style>