diff options
Diffstat (limited to 'current/support/v7/appcompat/res/values-v21')
| -rw-r--r-- | current/support/v7/appcompat/res/values-v21/styles_base.xml | 24 | ||||
| -rw-r--r-- | current/support/v7/appcompat/res/values-v21/themes_base.xml | 14 |
2 files changed, 11 insertions, 27 deletions
diff --git a/current/support/v7/appcompat/res/values-v21/styles_base.xml b/current/support/v7/appcompat/res/values-v21/styles_base.xml index bf78ff3..a65b90f 100644 --- a/current/support/v7/appcompat/res/values-v21/styles_base.xml +++ b/current/support/v7/appcompat/res/values-v21/styles_base.xml @@ -70,14 +70,6 @@ parent="android:TextAppearance.Material.Widget.ActionMode.Subtitle"> </style> - <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" - parent="android:TextAppearance.Material.Widget.ActionMode.Title.Inverse"> - </style> - - <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" - parent="android:TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse"> - </style> - <!-- Action Button Styles --> <style name="Base.Widget.AppCompat.ActionButton" @@ -202,6 +194,10 @@ parent="@android:TextAppearance.Material.SearchResult.Subtitle"> </style> + <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" /> + + <style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" /> + <!-- Progress Bar --> <style name="Base.Widget.AppCompat.ProgressBar.Horizontal" @@ -212,18 +208,6 @@ parent="android:Widget.Material.ProgressBar"> </style> - <!-- - TextAppearance.Material.Light.SearchResult.* are private so we extend from the default - versions instead (which are exactly the same). - --> - <style name="Base.TextAppearance.AppCompat.Light.SearchResult.Title" - parent="Base.TextAppearance.AppCompat.SearchResult.Title"> - </style> - - <style name="Base.TextAppearance.AppCompat.Light.SearchResult.Subtitle" - parent="Base.TextAppearance.AppCompat.SearchResult.Subtitle"> - </style> - <!-- TODO. Needs updating for Material --> <style name="Base.Widget.AppCompat.ActivityChooserView" parent=""> <item name="android:gravity">center</item> 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 fd28ac8..029f505 100644 --- a/current/support/v7/appcompat/res/values-v21/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v21/themes_base.xml @@ -55,6 +55,8 @@ <item name="actionButtonStyle">?android:attr/actionButtonStyle</item> <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item> <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item> + <item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item> + <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> <item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item> <item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item> @@ -79,8 +81,6 @@ <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"> @@ -91,6 +91,8 @@ <item name="actionButtonStyle">?android:attr/actionButtonStyle</item> <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item> <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item> + <item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item> + <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> <item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item> <item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item> @@ -190,23 +192,21 @@ <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog" /> <style name="Base.ThemeOverlay.AppCompat" parent="android:ThemeOverlay.Material"> - <!-- TODO: Need to check if we need to modify anything here --> </style> <style name="Base.ThemeOverlay.AppCompat.Dark" parent="android:ThemeOverlay.Material.Dark"> - <!-- TODO: Need to check if we need to modify anything here --> + <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> </style> <style name="Base.ThemeOverlay.AppCompat.Light" parent="android:ThemeOverlay.Material.Light"> - <!-- TODO: Need to check if we need to modify anything here --> + <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item> </style> <style name="Base.ThemeOverlay.AppCompat.ActionBar" parent="android:ThemeOverlay.Material.ActionBar"> - <!-- TODO: Need to check if we need to modify anything here --> </style> <style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" parent="android:ThemeOverlay.Material.Dark.ActionBar"> - <!-- TODO: Need to check if we need to modify anything here --> + <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> </style> </resources> |