summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-05-23 16:25:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-23 16:25:30 +0000
commit1a6938873a21aa464f5735e7592da5b868aae96b (patch)
tree6f8f406a81edb6cbe4d55d2cac51821080a46618 /res
parent89e59d6059c9f547ac1351efe89360af862dbe1f (diff)
parent85d992d7b92ad68714408aa1b307cc63064d9751 (diff)
am 85d992d7: Merge "Add padding to bottom of listviews" into lmp-preview-dev
* commit '85d992d7b92ad68714408aa1b307cc63064d9751': Add padding to bottom of listviews
Diffstat (limited to 'res')
-rw-r--r--res/layout/speeddial_fragment.xml2
-rw-r--r--res/values/dimens.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/speeddial_fragment.xml b/res/layout/speeddial_fragment.xml
index e8587faeb..f025e6179 100644
--- a/res/layout/speeddial_fragment.xml
+++ b/res/layout/speeddial_fragment.xml
@@ -40,7 +40,7 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:divider="@null"
- android:paddingBottom="@dimen/floating_action_button_height"
+ android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
android:nestedScrollingEnabled="true" />
</FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 433300db3..78d91c247 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -42,9 +42,9 @@
<dimen name="call_button_height">74dp</dimen>
<!-- Right margin of the floating action button -->
- <dimen name="floating_action_button_margin_right">10dp</dimen>
+ <dimen name="floating_action_button_margin_right">16dp</dimen>
<!-- Bottom margin of the floating action button -->
- <dimen name="floating_action_button_margin_bottom">10dp</dimen>
+ <dimen name="floating_action_button_margin_bottom">16dp</dimen>
<!-- Dimensions for speed dial tiles -->
<dimen name="contact_tile_divider_width">1dp</dimen>