diff options
Diffstat (limited to 'support/appcompat/res')
14 files changed, 17 insertions, 10 deletions
diff --git a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png Binary files differdeleted file mode 100644 index 465ee6d0..00000000 --- a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png +++ /dev/null diff --git a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png Binary files differindex 76a5c53d..76a5c53d 100644 --- a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_light.9.png +++ b/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png diff --git a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png Binary files differdeleted file mode 100644 index 36779947..00000000 --- a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png +++ /dev/null diff --git a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png Binary files differindex 02b25f09..02b25f09 100644 --- a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_light.9.png +++ b/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png Binary files differdeleted file mode 100644 index c1ad023a..00000000 --- a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png +++ /dev/null diff --git a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png Binary files differdeleted file mode 100644 index a1e33d67..00000000 --- a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png +++ /dev/null diff --git a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png Binary files differnew file mode 100644 index 00000000..4fda8677 --- /dev/null +++ b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png diff --git a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.png Binary files differdeleted file mode 100644 index 31a4caad..00000000 --- a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.png +++ /dev/null diff --git a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png Binary files differindex f5c18d08..f5c18d08 100644 --- a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_light.9.png +++ b/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png diff --git a/support/appcompat/res/layout/abc_expanded_menu_layout.xml b/support/appcompat/res/layout/abc_expanded_menu_layout.xml index f4af8823..20e8b19b 100644 --- a/support/appcompat/res/layout/abc_expanded_menu_layout.xml +++ b/support/appcompat/res/layout/abc_expanded_menu_layout.xml @@ -18,4 +18,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/expanded_menu" android:layout_width="?attr/panelMenuListWidth" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:background="?attr/panelBackground"/> diff --git a/support/appcompat/res/values-v11/themes_base.xml b/support/appcompat/res/values-v11/themes_base.xml index a8317e2d..54cd6ce8 100644 --- a/support/appcompat/res/values-v11/themes_base.xml +++ b/support/appcompat/res/values-v11/themes_base.xml @@ -252,7 +252,8 @@ <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_light</item> + <item name="android:panelBackground">@android:color/transparent</item> + <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item> <!-- List attributes --> diff --git a/support/appcompat/res/values-v21/styles_base.xml b/support/appcompat/res/values-v21/styles_base.xml index 3a9837c7..0ec6566c 100644 --- a/support/appcompat/res/values-v21/styles_base.xml +++ b/support/appcompat/res/values-v21/styles_base.xml @@ -126,7 +126,7 @@ </style> <style name="Base.Widget.AppCompat.ListView.Menu" - parent="android:Widget.ListView.Menu" /> + parent="android:Widget.Material.ListView" /> <!-- Popup Menu --> diff --git a/support/appcompat/res/values/attrs.xml b/support/appcompat/res/values/attrs.xml index 9bf6e09f..bcdb152a 100644 --- a/support/appcompat/res/values/attrs.xml +++ b/support/appcompat/res/values/attrs.xml @@ -260,12 +260,12 @@ <!-- ============ --> <eat-comment /> + <!-- The background of a panel when it is inset from the left and right edges of the screen. --> + <attr name="panelBackground" format="reference" /> <!-- Default Panel Menu width. --> <attr name="panelMenuListWidth" format="dimension" /> - <!-- Default Panel Menu style. --> <attr name="panelMenuListTheme" format="reference" /> - <!-- Drawable used as a background for selected list items. --> <attr name="listChoiceBackgroundIndicator" format="reference" /> @@ -443,7 +443,7 @@ <!-- Default disabled icon alpha for each menu item that shows an icon. --> <attr name="android:itemIconDisabledAlpha"/> <!-- Whether space should be reserved in layout when an icon is missing. --> - <attr name="android:preserveIconSpacing"/> + <attr name="preserveIconSpacing" format="boolean" /> </declare-styleable> <declare-styleable name="ActionMenuView"> <!-- Size of padding on either end of a divider. --> @@ -734,6 +734,9 @@ <!-- Text to set as the content description for the navigation button located at the start of the toolbar. --> <attr name="navigationContentDescription" format="string" /> + + <!-- Allows us to read in the minHeight attr pre-v16 --> + <attr name="android:minHeight" /> </declare-styleable> <declare-styleable name="PopupWindowBackgroundState"> diff --git a/support/appcompat/res/values/themes_base.xml b/support/appcompat/res/values/themes_base.xml index 7c14d0c3..d7f72710 100644 --- a/support/appcompat/res/values/themes_base.xml +++ b/support/appcompat/res/values/themes_base.xml @@ -201,7 +201,8 @@ <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item> + <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item> + <item name="android:panelBackground">@android:color/transparent</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> <!-- List attributes --> @@ -305,7 +306,8 @@ <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_light</item> + <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item> + <item name="android:panelBackground">@android:color/transparent</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item> <!-- List attributes --> @@ -370,7 +372,6 @@ <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> <!-- Panel attributes --> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> <item name="colorPrimaryDark">@color/material_blue_grey_900</item> @@ -431,7 +432,8 @@ <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item> + <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item> + <item name="android:panelBackground">@android:color/transparent</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> <!-- List attributes --> |