commit ba6f08903c8485fc02864afb4f85469fd42ae115
author Chris Banes <chrisbanes@google.com> Fri Jun 12 09:27:38 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 12 09:27:39 2015 +0000
tree 4b2934c42034690f82765e05650780223ee073d1
parent 1ffa85270d5f9b145c5521e1a3d40323dfb461b2
parent 756fd1e006bc097f12c44572dc049f4018582503

Merge "Add missing Material EditText style redirect" into lmp-mr1-ub-dev

v7/appcompat/res/values-v21/styles_base.xml

diff --git a/v7/appcompat/res/values-v21/styles_base.xml b/v7/appcompat/res/values-v21/styles_base.xml
index 1bf90ef..241cb04 100644
--- a/v7/appcompat/res/values-v21/styles_base.xml
+++ b/v7/appcompat/res/values-v21/styles_base.xml
@@ -174,6 +174,8 @@
 
     <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" />
 
+    <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText" />
+
     <style name="Base.Widget.AppCompat.RatingBar" parent="android:Widget.Material.RatingBar" />
 
     <style name="Base.Widget.AppCompat.Button" parent="android:Widget.Material.Button" />

v7/appcompat/res/values/styles.xml

diff --git a/v7/appcompat/res/values/styles.xml b/v7/appcompat/res/values/styles.xml
index b38c6ad..0ac20d5 100644
--- a/v7/appcompat/res/values/styles.xml
+++ b/v7/appcompat/res/values/styles.xml
@@ -194,9 +194,7 @@
     <style name="Widget.AppCompat.SearchView" parent="Base.Widget.AppCompat.SearchView" />
     <style name="Widget.AppCompat.SearchView.ActionBar" parent="Base.Widget.AppCompat.SearchView.ActionBar" />
 
-    <style name="Widget.AppCompat.EditText"
-           parent="Base.Widget.AppCompat.EditText">
-    </style>
+    <style name="Widget.AppCompat.EditText" parent="Base.Widget.AppCompat.EditText"/>
 
     <style name="Widget.AppCompat.CompoundButton.Switch" parent="Base.Widget.AppCompat.CompoundButton.Switch" />