Merge "Update colorError to reflect changes in platform"
diff --git a/v7/appcompat/res/values/colors_material.xml b/v7/appcompat/res/values/colors_material.xml
index cf21172..7d5ca2c 100644
--- a/v7/appcompat/res/values/colors_material.xml
+++ b/v7/appcompat/res/values/colors_material.xml
@@ -99,7 +99,8 @@
<color name="primary_text_disabled_material_dark">#4Dffffff</color>
<color name="secondary_text_disabled_material_dark">#36ffffff</color>
- <color name="error_color_material">#F4511E</color>
+ <color name="error_color_material_dark">#ff7043</color><!-- deep orange 400 -->
+ <color name="error_color_material_light">#ff5722</color><!-- deep orange 500 -->
<!-- Primary & accent colors -->
<eat-comment />
diff --git a/v7/appcompat/res/values/themes_base.xml b/v7/appcompat/res/values/themes_base.xml
index f628499..def6423 100644
--- a/v7/appcompat/res/values/themes_base.xml
+++ b/v7/appcompat/res/values/themes_base.xml
@@ -316,7 +316,7 @@
<item name="tooltipFrameBackground">@drawable/tooltip_frame_light</item>
<item name="tooltipForegroundColor">@color/foreground_material_light</item>
- <item name="colorError">@color/error_color_material</item>
+ <item name="colorError">@color/error_color_material_dark</item>
</style>
<!-- Base platform-dependent theme providing an action bar in a light-themed activity. -->
@@ -487,7 +487,7 @@
<item name="tooltipFrameBackground">@drawable/tooltip_frame_dark</item>
<item name="tooltipForegroundColor">@color/foreground_material_dark</item>
- <item name="colorError">@color/error_color_material</item>
+ <item name="colorError">@color/error_color_material_light</item>
</style>
<style name="Base.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">