summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-12-03 21:10:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-12-03 21:10:21 +0000
commitd3adf0986ba53b794ac8f8b70a8784ca6945d4ba (patch)
tree0c0a2ddcc5298926bee5174c94902d8b22f77397
parent281f36f5483ade3800092a42109327347d8aaff6 (diff)
parent0079f043631cd5e7fecdd94fe34099be5fb50d43 (diff)
Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev
-rw-r--r--core/res/res/values/dimens_material.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index f7ebbe406adb..dd1f815405e1 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -87,9 +87,9 @@
<dimen name="floating_window_margin_bottom">32dp</dimen>
<!-- 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 -->
- <dimen name="button_pressed_z_material">2dp</dimen>
+ <dimen name="button_pressed_z_material">6dp</dimen>
<!-- Default insets (outer padding) around buttons -->
<dimen name="button_inset_vertical_material">6dp</dimen>
<dimen name="button_inset_horizontal_material">@dimen/control_inset_material</dimen>