Fix EditText background attr propogation
Since we have our own ?attr/editTextBackground
attribute, it should work on all platforms.
BUG: 24501070
Change-Id: I6b36261283dc8701fd12e2e96d57d2ebdf1d4edb
diff --git a/v7/appcompat/res/values-v21/styles_base.xml b/v7/appcompat/res/values-v21/styles_base.xml
index f630b29..4ec0ee12 100644
--- a/v7/appcompat/res/values-v21/styles_base.xml
+++ b/v7/appcompat/res/values-v21/styles_base.xml
@@ -166,9 +166,13 @@
parent="android:TextAppearance.Material.SearchResult.Subtitle">
</style>
- <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" />
+ <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView">
+ <item name="android:background">?attr/editTextBackground</item>
+ </style>
- <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText" />
+ <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText">
+ <item name="android:background">?attr/editTextBackground</item>
+ </style>
<style name="Base.Widget.AppCompat.RatingBar" parent="android:Widget.Material.RatingBar" />
diff --git a/v7/appcompat/res/values-v21/themes_base.xml b/v7/appcompat/res/values-v21/themes_base.xml
index 1674b9b..3d9f010 100644
--- a/v7/appcompat/res/values-v21/themes_base.xml
+++ b/v7/appcompat/res/values-v21/themes_base.xml
@@ -71,10 +71,8 @@
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
<!-- Copy the platform default styles for the AppCompat widgets -->
- <item name="autoCompleteTextViewStyle">?android:attr/autoCompleteTextViewStyle</item>
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
<item name="checkedTextViewStyle">?android:attr/checkedTextViewStyle</item>
- <item name="editTextStyle">?android:attr/editTextStyle</item>
<item name="radioButtonStyle">?android:attr/radioButtonStyle</item>
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
@@ -118,10 +116,8 @@
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
<!-- Copy the platform default styles for the AppCompat widgets -->
- <item name="autoCompleteTextViewStyle">?android:attr/autoCompleteTextViewStyle</item>
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
<item name="checkedTextViewStyle">?android:attr/checkedTextViewStyle</item>
- <item name="editTextStyle">?android:attr/editTextStyle</item>
<item name="radioButtonStyle">?android:attr/radioButtonStyle</item>
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
