summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-11-20 19:16:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-11-20 19:16:25 +0000
commit93da37a03b10eaa2971d04e5bbd86b79a154c46a (patch)
tree9fd6ee424de95dfab4a941314f5e982be151d047
parentf66f3052a7e99eac436b423280687b84f1ef77d6 (diff)
parent2af21e0bfabf04578623ff31e4fa77e955588968 (diff)
Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev
-rw-r--r--core/res/res/layout/select_dialog_material.xml9
-rw-r--r--core/res/res/values/dimens_material.xml3
2 files changed, 9 insertions, 3 deletions
diff --git a/core/res/res/layout/select_dialog_material.xml b/core/res/res/layout/select_dialog_material.xml
index ee040392f2c5..19ad407d7a96 100644
--- a/core/res/res/layout/select_dialog_material.xml
+++ b/core/res/res/layout/select_dialog_material.xml
@@ -22,11 +22,14 @@
-->
<view class="com.android.internal.app.AlertController$RecycleListView"
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+android:id/select_dialog_listview"
+ android:id="@id/select_dialog_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="@null"
- android:divider="?android:attr/listDividerAlertDialog"
+ android:divider="?attr/listDividerAlertDialog"
android:scrollbars="vertical"
android:overScrollMode="ifContentScrolls"
- android:textAlignment="viewStart" />
+ android:textAlignment="viewStart"
+ android:paddingTop="@dimen/dialog_list_padding_vertical_material"
+ android:paddingBottom="@dimen/dialog_list_padding_vertical_material"
+ android:clipToPadding="false" />
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index e3672c8ffc1c..54f483d4a7a9 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -97,4 +97,7 @@
<dimen name="dialog_padding_material">24dp</dimen>
<dimen name="dialog_padding_top_material">18dp</dimen>
+
+ <!-- Padding above and below selection dialog lists. -->
+ <dimen name="dialog_list_padding_vertical_material">8dp</dimen>
</resources>