commit e9d1869812768e0e340c58554e1eb38c9330c366
author Alan Viverette <alanv@google.com> Thu Dec 17 21:18:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 17 21:18:25 2015 +0000
tree b17e4249af5a65017ba293ec1d60df169f3e2bb5
parent 77309fa1715f57d8ef44e553ba5d949ae451ebf6
parent 1af6fe9fba35475635c1baab2aeddb91a4e60204

Merge "Clamp action bar button height to default minimum height"

core/res/res/values/styles.xml

diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 9a4016b..937d83d 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1235,7 +1235,7 @@
         <item name="subtitleTextAppearance">@style/TextAppearance.Widget.Toolbar.Subtitle</item>
         <item name="minHeight">?attr/actionBarSize</item>
         <item name="titleMargin">4dp</item>
-        <item name="maxButtonHeight">56dp</item>
+        <item name="maxButtonHeight">@dimen/action_bar_default_height_material</item>
         <item name="buttonGravity">top</item>
         <item name="navigationButtonStyle">@style/Widget.Toolbar.Button.Navigation</item>
         <item name="collapseIcon">?attr/homeAsUpIndicator</item>