summaryrefslogtreecommitdiffstats
path: root/current/support/v7/appcompat/res/values-v21/styles_base.xml
diff options
context:
space:
mode:
authorSailesh Nepal <sail@google.com>2014-08-18 18:18:10 -0700
committerSailesh Nepal <sail@google.com>2014-08-18 18:18:27 -0700
commit0c91dcd016bda22cec455ddadda63396da5e16d0 (patch)
tree06b4d879b04e45fab9bd6e161c750233da941aa2 /current/support/v7/appcompat/res/values-v21/styles_base.xml
parent4f599d39a626ab95ca2ce8d90e290826cf4c998a (diff)
downloadprebuilts_sdk-0c91dcd016bda22cec455ddadda63396da5e16d0.zip
prebuilts_sdk-0c91dcd016bda22cec455ddadda63396da5e16d0.tar.gz
prebuilts_sdk-0c91dcd016bda22cec455ddadda63396da5e16d0.tar.bz2
DO NOT MERGE - Update prebuilt current SDK
Copied files from lmp-dev branch at #1364404 http://android-build/builds/git_lmp-dev-linux-sdk_x86_64-sdk/1364404 Followed the instruction given at : goto/updateprebuilts Change-Id: I6a294267f5d0ad6805c7177a3f5672b15c69af8c
Diffstat (limited to 'current/support/v7/appcompat/res/values-v21/styles_base.xml')
-rw-r--r--current/support/v7/appcompat/res/values-v21/styles_base.xml24
1 files changed, 4 insertions, 20 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>