summaryrefslogtreecommitdiffstats
path: root/current/support/design/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'current/support/design/res/values')
-rw-r--r--current/support/design/res/values/attrs.xml5
-rw-r--r--current/support/design/res/values/dimens.xml1
-rw-r--r--current/support/design/res/values/styles.xml4
3 files changed, 7 insertions, 3 deletions
diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index bf81b54..772c320 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -40,10 +40,12 @@
</declare-styleable>
<declare-styleable name="NavigationView">
- <attr name="android:elevation" />
<attr name="android:background" />
<attr name="android:fitsSystemWindows" />
<attr name="android:maxWidth" />
+ <attr name="elevation" />
+ <!-- The menu resource to inflate and populate items from. -->
+ <attr name="menu" format="reference" />
<attr name="itemTint" format="color|reference" />
<attr name="itemBackground" format="reference" />
</declare-styleable>
@@ -154,6 +156,7 @@
<declare-styleable name="SnackbarLayout">
<attr name="android:maxWidth" />
+ <attr name="elevation" />
<attr name="maxActionInlineWidth" format="dimension" />
</declare-styleable>
diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml
index 23d9c0d..f3a9111 100644
--- a/current/support/design/res/values/dimens.xml
+++ b/current/support/design/res/values/dimens.xml
@@ -28,6 +28,7 @@
<dimen name="navigation_icon_size">24dp</dimen>
<dimen name="navigation_separator_vertical_padding">8dp</dimen>
<dimen name="navigation_padding_top_default">0dp</dimen>
+ <dimen name="navigation_padding_bottom">8dp</dimen>
<dimen name="tab_min_width">72dp</dimen>
<dimen name="tab_max_width">264dp</dimen>
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index 46e2144..1494432 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -31,7 +31,7 @@
</style>
<style name="Widget.Design.NavigationView" parent="">
- <item name="android:elevation">@dimen/navigation_elevation</item>
+ <item name="elevation">@dimen/navigation_elevation</item>
<item name="android:background">?android:attr/windowBackground</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:maxWidth">@dimen/navigation_max_width</item>
@@ -88,7 +88,7 @@
<item name="android:background">@drawable/snackbar_background</item>
<item name="android:paddingLeft">@dimen/snackbar_padding_horizontal</item>
<item name="android:paddingRight">@dimen/snackbar_padding_horizontal</item>
- <item name="android:elevation">@dimen/snackbar_elevation</item>
+ <item name="elevation">@dimen/snackbar_elevation</item>
<item name="maxActionInlineWidth">@dimen/snackbar_action_inline_max_width</item>
</style>