diff options
author | Sailesh Nepal <sail@google.com> | 2014-08-18 18:18:10 -0700 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2014-08-18 18:18:27 -0700 |
commit | 0c91dcd016bda22cec455ddadda63396da5e16d0 (patch) | |
tree | 06b4d879b04e45fab9bd6e161c750233da941aa2 /current/support/v7/appcompat/res/values/styles.xml | |
parent | 4f599d39a626ab95ca2ce8d90e290826cf4c998a (diff) | |
download | prebuilts_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/styles.xml')
-rw-r--r-- | current/support/v7/appcompat/res/values/styles.xml | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml index bade768..8820bec 100644 --- a/current/support/v7/appcompat/res/values/styles.xml +++ b/current/support/v7/appcompat/res/values/styles.xml @@ -116,10 +116,6 @@ <style name="Widget.AppCompat.ActionMode" parent="Base.Widget.AppCompat.ActionMode"> </style> - <style name="Widget.AppCompat.Light.ActionMode.Inverse" - parent="Base.Widget.AppCompat.Light.ActionMode.Inverse"> - </style> - <style name="TextAppearance.AppCompat.Widget.ActionMode.Title" parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Title"> </style> @@ -128,14 +124,6 @@ parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle"> </style> - <style name="TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" - parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse"> - </style> - - <style name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" - parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse"> - </style> - <style name="TextAppearance.AppCompat.Widget.DropDownItem" parent="Base.TextAppearance.AppCompat.Widget.DropDownItem"> </style> @@ -223,14 +211,6 @@ parent="Base.TextAppearance.AppCompat.SearchResult.Subtitle"> </style> - <style name="TextAppearance.AppCompat.Light.SearchResult.Title" - parent="Base.TextAppearance.AppCompat.Light.SearchResult.Title"> - </style> - - <style name="TextAppearance.AppCompat.Light.SearchResult.Subtitle" - parent="Base.TextAppearance.AppCompat.Light.SearchResult.Subtitle"> - </style> - <style name="Widget.AppCompat.AutoCompleteTextView" parent="Base.Widget.AppCompat.AutoCompleteTextView"> </style> @@ -316,12 +296,15 @@ <!-- - The following themes are deprecated and now resolve to their parent. + The following themes are deprecated. --> <style name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" /> - <style name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" /> - <style name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" /> + <style name="TextAppearance.AppCompat.Light.SearchResult.Title" parent="TextAppearance.AppCompat.SearchResult.Title" /> + <style name="TextAppearance.AppCompat.Light.SearchResult.Subtitle" parent="TextAppearance.AppCompat.SearchResult.Subtitle" /> + <style name="Widget.AppCompat.Light.ActionMode.Inverse" parent="Widget.AppCompat.ActionMode" /> + <style name="TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" parent="TextAppearance.AppCompat.Widget.ActionMode.Title" /> + <style name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.AppCompat.Widget.ActionMode.Subtitle" /> </resources> |