diff options
| author | Clara Bayarri <clarabayarri@google.com> | 2015-04-09 11:38:09 +0100 |
|---|---|---|
| committer | Clara Bayarri <clarabayarri@google.com> | 2015-04-09 16:18:35 +0100 |
| commit | 47af33ae2310cf2f28dc84f4dbc2d279d17a25e4 (patch) | |
| tree | a4a9d31ff05e99cc46ac055f0edf7e68bb4916e4 /current/support/design/res | |
| parent | 17dc0f0bfc658f63ceb3047e6072279d009c0320 (diff) | |
| download | prebuilts_sdk-47af33ae2310cf2f28dc84f4dbc2d279d17a25e4.zip prebuilts_sdk-47af33ae2310cf2f28dc84f4dbc2d279d17a25e4.tar.gz prebuilts_sdk-47af33ae2310cf2f28dc84f4dbc2d279d17a25e4.tar.bz2 | |
Update the prebuilts/sdk/current contents
Build id used: 1841989
Change-Id: Iff9faa6ea51c229e73f15db7dfdeac1fcada689c
Diffstat (limited to 'current/support/design/res')
6 files changed, 10 insertions, 7 deletions
diff --git a/current/support/design/res/layout/design_navigation_item_separator.xml b/current/support/design/res/layout/design_navigation_item_separator.xml index fb786aa..938a3fb 100644 --- a/current/support/design/res/layout/design_navigation_item_separator.xml +++ b/current/support/design/res/layout/design_navigation_item_separator.xml @@ -16,9 +16,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="@dimen/navigation_separator_vertical_padding" - android:paddingBottom="@dimen/navigation_separator_vertical_padding"> + android:layout_height="wrap_content"> <View android:layout_width="match_parent" android:layout_height="1dp" diff --git a/current/support/design/res/layout/design_navigation_item_space.xml b/current/support/design/res/layout/design_navigation_item_space.xml index e8e7b2f..6d709ab 100644 --- a/current/support/design/res/layout/design_navigation_item_space.xml +++ b/current/support/design/res/layout/design_navigation_item_space.xml @@ -16,5 +16,5 @@ --> <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="16dp" + android:layout_height="@dimen/navigation_separator_vertical_padding" android:visibility="invisible" /> diff --git a/current/support/design/res/layout/design_navigation_menu.xml b/current/support/design/res/layout/design_navigation_menu.xml index 6c75423..a40f2eb 100644 --- a/current/support/design/res/layout/design_navigation_menu.xml +++ b/current/support/design/res/layout/design_navigation_menu.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="@dimen/navigation_padding_top_default" + android:paddingBottom="@dimen/navigation_padding_bottom" android:clipToPadding="false" android:divider="@null" android:listSelector="?attr/selectableItemBackground"/> 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> |