diff options
Diffstat (limited to 'current/support/v7/appcompat')
49 files changed, 88 insertions, 144 deletions
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex 0350382..c1fc93d 100644 --- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar +++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_holo_dark.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_holo_dark.png Binary files differdeleted file mode 100644 index d8662e3..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_holo_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_holo_light.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_holo_light.png Binary files differdeleted file mode 100644 index ed03f62..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_holo_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_dark.png Binary files differnew file mode 100644 index 0000000..a587769 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_dark.png diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_light.png Binary files differnew file mode 100644 index 0000000..7c1efe6 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_light.png diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differnew file mode 100644 index 0000000..5635459 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_mtrl_alpha.png diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_holo_dark.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_holo_dark.9.png Binary files differdeleted file mode 100644 index 986ab0b..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_holo_dark.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_holo_light.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_holo_light.9.png Binary files differdeleted file mode 100644 index 0279e17..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_holo_light.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_material_dark.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_material_dark.9.png Binary files differnew file mode 100644 index 0000000..3ff16f2 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_material_dark.9.png diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_material_light.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_material_light.9.png Binary files differnew file mode 100644 index 0000000..fab51ac --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_material_light.9.png diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png Binary files differnew file mode 100644 index 0000000..77845df --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_holo_dark.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_holo_dark.png Binary files differdeleted file mode 100644 index a17b6a7..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_holo_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_holo_light.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_holo_light.png Binary files differdeleted file mode 100644 index b28b3b5..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_holo_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_dark.png Binary files differnew file mode 100644 index 0000000..aa790ec --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_dark.png diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_light.png Binary files differnew file mode 100644 index 0000000..beb3194 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_light.png diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differnew file mode 100644 index 0000000..541184a --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_mtrl_alpha.png diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_holo_dark.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_holo_dark.9.png Binary files differdeleted file mode 100644 index 986ab0b..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_holo_dark.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_holo_light.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_holo_light.9.png Binary files differdeleted file mode 100644 index 0279e17..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_holo_light.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_material_dark.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_material_dark.9.png Binary files differnew file mode 100644 index 0000000..3ff16f2 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_material_dark.9.png diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_material_light.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_material_light.9.png Binary files differnew file mode 100644 index 0000000..fab51ac --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_material_light.9.png diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png Binary files differnew file mode 100644 index 0000000..77845df --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_holo_dark.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_holo_dark.png Binary files differdeleted file mode 100644 index 2e06dd0..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_holo_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_holo_light.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_holo_light.png Binary files differdeleted file mode 100644 index bb19810..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_holo_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_dark.png Binary files differnew file mode 100644 index 0000000..540786f --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_dark.png diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_light.png Binary files differnew file mode 100644 index 0000000..f9323f1 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_light.png diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differnew file mode 100644 index 0000000..3d6d734 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_mtrl_alpha.png diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_holo_dark.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_holo_dark.9.png Binary files differdeleted file mode 100644 index e62f011..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_holo_dark.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_holo_light.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_holo_light.9.png Binary files differdeleted file mode 100644 index 65061c0..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_holo_light.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_material_dark.9.png Binary files differnew file mode 100644 index 0000000..3ff16f2 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_material_dark.9.png diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_material_light.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_material_light.9.png Binary files differnew file mode 100644 index 0000000..fab51ac --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_material_light.9.png diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png Binary files differnew file mode 100644 index 0000000..77845df --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_holo_dark.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_holo_dark.png Binary files differdeleted file mode 100644 index f06cd48..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_holo_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_holo_light.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_holo_light.png Binary files differdeleted file mode 100644 index 40a448e..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_holo_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_dark.png Binary files differnew file mode 100644 index 0000000..31317fd --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_dark.png diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_light.png Binary files differnew file mode 100644 index 0000000..5c409d9 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_light.png diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differnew file mode 100644 index 0000000..1f9c734 --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_mtrl_alpha.png diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_holo_dark.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_holo_dark.9.png Binary files differdeleted file mode 100644 index 9678825..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_holo_dark.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_holo_light.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_holo_light.9.png Binary files differdeleted file mode 100644 index c69a6a3..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_holo_light.9.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_material_dark.9.png Binary files differnew file mode 100644 index 0000000..d3c90ce --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_material_dark.9.png diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_material_light.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_material_light.9.png Binary files differnew file mode 100644 index 0000000..6af66af --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_material_light.9.png diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png Binary files differnew file mode 100644 index 0000000..0fafd1a --- /dev/null +++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/current/support/v7/appcompat/res/values-v11/styles_base.xml b/current/support/v7/appcompat/res/values-v11/styles_base.xml index 6583424..4e51013 100644 --- a/current/support/v7/appcompat/res/values-v11/styles_base.xml +++ b/current/support/v7/appcompat/res/values-v11/styles_base.xml @@ -31,14 +31,4 @@ parent="android:Widget.Holo.ProgressBar"> </style> - <!-- AutoCompleteTextView styles (for SearchView) --> - - <style name="Base.Widget.AppCompat.AutoCompleteTextView" - parent="android:Widget.Holo.AutoCompleteTextView"> - </style> - - <style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" - parent="android:Widget.Holo.Light.AutoCompleteTextView"> - </style> - </resources>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values-v11/themes_base.xml b/current/support/v7/appcompat/res/values-v11/themes_base.xml index 8c99cbf..93b1f92 100644 --- a/current/support/v7/appcompat/res/values-v11/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml @@ -186,8 +186,9 @@ <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item> - <item name="dividerVertical">@drawable/abc_list_divider_holo_light</item> - <item name="dividerHorizontal">@drawable/abc_list_divider_holo_light</item> + <item name="android:listDivider">@drawable/abc_list_divider_material_light</item> + <item name="dividerVertical">?android:attr/listDivider</item> + <item name="dividerHorizontal">?android:attr/listDivider</item> <!-- Action Bar Styles --> <item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item> @@ -210,8 +211,9 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">?attr/colorPrimaryDark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_light</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_light</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> + <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> <!-- Dropdown Spinner Attributes --> <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> @@ -246,10 +248,8 @@ <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item> <item name="android:dropDownItemStyle">@style/Widget.AppCompat.Light.DropDownItem.Spinner</item> <item name="textColorSearchUrl">@color/abc_search_url_text</item> - <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.Light.SearchResult.Title</item> - <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.Light.SearchResult.Subtitle</item> - - <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> + <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> + <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> <!-- ShareActionProvider attributes --> <item name="activityChooserViewStyle">@style/Widget.AppCompat.Light.ActivityChooserView</item> 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> diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml index aabd8e7..f279481 100644 --- a/current/support/v7/appcompat/res/values/attrs.xml +++ b/current/support/v7/appcompat/res/values/attrs.xml @@ -708,8 +708,11 @@ <attr name="contentInsetRight" /> <attr name="maxButtonHeight" format="dimension" /> - <!-- Use Theme toolbarNavigationButtonStyle instead --> - <!-- <attr name="navigationButtonStyle" format="reference" /> --> + <!-- Specifies a theme override for a view. When a theme override is set, the + view will be inflated using a {@link android.content.Context} themed with + the specified resource. During XML inflation, any child views under the + view with a theme override will inherit the themed context. --> + <attr name="theme" format="reference" /> <attr name="buttonGravity"> <!-- Push object to the top of its container, not changing its size. --> 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> diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml index cfec354..e8c6350 100644 --- a/current/support/v7/appcompat/res/values/styles_base.xml +++ b/current/support/v7/appcompat/res/values/styles_base.xml @@ -146,11 +146,6 @@ </item> </style> - <style name="Base.Widget.AppCompat.Light.ActionMode.Inverse" parent="Base.Widget.AppCompat.ActionMode"> - <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item> - <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item> - </style> - <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title" parent="TextAppearance.AppCompat.Medium"> <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item> </style> @@ -159,14 +154,6 @@ <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item> </style> - <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" parent="TextAppearance.AppCompat.Medium.Inverse"> - <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item> - </style> - - <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.AppCompat.Small.Inverse"> - <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item> - </style> - <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" parent="android:TextAppearance.Small"> <item name="android:textSize">12sp</item> <item name="android:textStyle">bold</item> @@ -313,33 +300,16 @@ <item name="android:textColor">?android:textColorSecondary</item> </style> - <style name="Base.TextAppearance.AppCompat.Light.SearchResult" - parent="Base.TextAppearance.AppCompat.SearchResult"> - <item name="android:textColor">?android:textColorPrimary</item> - <item name="android:textColorHint">?android:textColorHint</item> - </style> - - <style name="Base.TextAppearance.AppCompat.Light.SearchResult.Title"> - <item name="android:textSize">18sp</item> - </style> - - <style name="Base.TextAppearance.AppCompat.Light.SearchResult.Subtitle"> - <item name="android:textSize">14sp</item> - <item name="android:textColor">?android:textColorSecondary</item> - </style> - - <style name="Base.Widget.AppCompat.AutoCompleteTextView" - parent="android:Widget.AutoCompleteTextView"> + <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView"> <item name="android:textColor">?attr/actionMenuTextColor</item> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item> - <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_dark</item> + <item name="android:popupBackground">@drawable/abc_popup_background_material_light</item> </style> - <style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" - parent="android:Widget.AutoCompleteTextView"> + <style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView"> <item name="android:textColor">?attr/actionMenuTextColor</item> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_light</item> - <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_light</item> + <item name="android:popupBackground">@drawable/abc_popup_background_material_light</item> </style> <style name="Base.Widget.AppCompat.ActivityChooserView" parent=""> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index 66842bf..67a1e32 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -153,8 +153,9 @@ <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> - <item name="dividerVertical">@drawable/abc_list_divider_holo_dark</item> - <item name="dividerHorizontal">@drawable/abc_list_divider_holo_dark</item> + <item name="android:listDivider">@drawable/abc_list_divider_material_dark</item> + <item name="dividerVertical">?android:attr/listDivider</item> + <item name="dividerHorizontal">?android:attr/listDivider</item> <!-- Action Bar Styles --> <item name="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item> @@ -180,8 +181,9 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">?attr/colorPrimaryDark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_dark</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_dark</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> @@ -216,8 +218,6 @@ <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> - <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> - <!-- ShareActionProvider attributes --> <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item> @@ -253,8 +253,9 @@ <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item> - <item name="dividerVertical">@drawable/abc_list_divider_holo_light</item> - <item name="dividerHorizontal">@drawable/abc_list_divider_holo_light</item> + <item name="android:listDivider">@drawable/abc_list_divider_material_light</item> + <item name="dividerVertical">?android:attr/listDivider</item> + <item name="dividerHorizontal">?android:attr/listDivider</item> <!-- Action Bar Styles --> <item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item> @@ -277,8 +278,9 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">?attr/colorPrimaryDark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_light</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_light</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> + <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> <!-- Dropdown Spinner Attributes --> <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> @@ -313,10 +315,8 @@ <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item> <item name="android:dropDownItemStyle">@style/Widget.AppCompat.Light.DropDownItem.Spinner</item> <item name="textColorSearchUrl">@color/abc_search_url_text</item> - <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.Light.SearchResult.Title</item> - <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.Light.SearchResult.Subtitle</item> - - <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> + <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> + <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> <!-- ShareActionProvider attributes --> <item name="activityChooserViewStyle">@style/Widget.AppCompat.Light.ActivityChooserView</item> @@ -348,30 +348,9 @@ </style> <style name="Base.Theme.AppCompat.Light.DarkActionBar" parent="Base.Theme.AppCompat.Light"> - <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> - - <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item> <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="actionBarWidgetTheme">@null</item> - <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark</item> - <item name="actionBarDivider">@drawable/abc_list_divider_holo_dark</item> - <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> - - <!-- Action Mode --> - <item name="actionModeStyle">@style/Widget.AppCompat.Light.ActionMode.Inverse</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_dark</item> - <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> - <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> - - <!-- SearchView attributes --> - <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> - <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> - <item name="textColorSearchUrl">@color/abc_search_url_text</item> - <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> - <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> - - <!-- Dropdown Spinner Attributes --> - <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> + <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> <!-- Panel attributes --> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> @@ -397,8 +376,9 @@ <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> - <item name="dividerVertical">@drawable/abc_list_divider_holo_dark</item> - <item name="dividerHorizontal">@drawable/abc_list_divider_holo_dark</item> + <item name="android:listDivider">@drawable/abc_list_divider_material_dark</item> + <item name="dividerVertical">?android:attr/listDivider</item> + <item name="dividerHorizontal">?android:attr/listDivider</item> <!-- Action Bar Styles --> <item name="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item> @@ -424,8 +404,9 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">?attr/colorPrimaryDark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_dark</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_dark</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> @@ -460,8 +441,6 @@ <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> - <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> - <!-- ShareActionProvider attributes --> <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item> @@ -512,6 +491,7 @@ <style name="Base.ThemeOverlay.AppCompat" parent="" /> <style name="Base.ThemeOverlay.AppCompat.Light"> + <item name="android:windowBackground">@color/background_material_light</item> <item name="android:colorForeground">@color/bright_foreground_material_light</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item> <item name="android:colorBackground">@color/background_material_light</item> @@ -530,16 +510,33 @@ <item name="android:textColorHighlight">@color/highlighted_text_material_light</item> <item name="android:textColorLink">@color/material_teal_500</item> - <item name="android:windowBackground">@color/background_material_light</item> + <item name="android:listDivider">@drawable/abc_list_divider_material_light</item> + <item name="actionBarItemBackground">@drawable/abc_item_background_holo_light</item> + <item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item> + <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> + <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.Light.ActionButton.Overflow</item> + <item name="actionOverflowMenuStyle">@style/Widget.AppCompat.Light.PopupMenu.Overflow</item> + <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> + <!-- Action Mode styles --> + <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_light</item> + <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> + <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> + + <!-- SearchView attributes --> + <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.Light.AutoCompleteTextView</item> + <item name="android:dropDownItemStyle">@style/Widget.AppCompat.Light.DropDownItem.Spinner</item> + <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item> + <item name="colorControlNormal">?android:attr/textColorSecondary</item> <item name="colorControlHighlight">@color/ripple_material_light</item> <!--<item name="colorButtonNormal">@color/btn_default_material_light</item>--> </style> <style name="Base.ThemeOverlay.AppCompat.Dark"> + <item name="android:windowBackground">@color/background_material_dark</item> <item name="android:colorForeground">@color/bright_foreground_material_dark</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item> <item name="android:colorBackground">@color/background_material_dark</item> @@ -557,10 +554,27 @@ <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> <item name="android:textColorLink">@color/material_teal_500</item> - <item name="android:windowBackground">@color/background_material_dark</item> + <item name="android:listDivider">@drawable/abc_list_divider_material_dark</item> + <!-- Action Bar styles --> + <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> + <item name="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item> + <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> + <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item> + <item name="actionOverflowMenuStyle">@style/Widget.AppCompat.PopupMenu.Overflow</item> + <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> + <!-- Action Mode styles --> + <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_dark</item> + <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> + + <!-- SearchView styles --> + <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> + <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> + <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> + <item name="colorControlNormal">?android:attr/textColorSecondary</item> <item name="colorControlHighlight">@color/ripple_material_dark</item> <!--<item name="colorButtonNormal">@color/btn_default_material_dark</item>--> |
