am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev

* commit 'd3adf0986ba53b794ac8f8b70a8784ca6945d4ba':
  Slightly more button elevation to match Material spec
This commit is contained in:
Alan Viverette
2014-12-03 21:12:30 +00:00
committed by Android Git Automerger

View File

@@ -87,9 +87,9 @@
<dimen name="floating_window_margin_bottom">32dp</dimen> <dimen name="floating_window_margin_bottom">32dp</dimen>
<!-- Elevation when button is pressed --> <!-- Elevation when button is pressed -->
<dimen name="button_elevation_material">1dp</dimen> <dimen name="button_elevation_material">4dp</dimen>
<!-- Z translation to apply when button is pressed --> <!-- Z translation to apply when button is pressed -->
<dimen name="button_pressed_z_material">2dp</dimen> <dimen name="button_pressed_z_material">6dp</dimen>
<!-- Default insets (outer padding) around buttons --> <!-- Default insets (outer padding) around buttons -->
<dimen name="button_inset_vertical_material">6dp</dimen> <dimen name="button_inset_vertical_material">6dp</dimen>
<dimen name="button_inset_horizontal_material">@dimen/control_inset_material</dimen> <dimen name="button_inset_horizontal_material">@dimen/control_inset_material</dimen>