summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2016-05-16 14:56:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-05-16 14:56:38 +0000
commitbacbcba682df2d3e08e4e27f1aec3e2e0f57d7e5 (patch)
tree5f16c39de482f623d38f98ef59968bacee7ae36d
parentc4033e7c668abc1e671a130f70f58f885c63b176 (diff)
parentfdb54bda753f78be513cce16a38dca85b57f35ea (diff)
Merge "Give the AM/PM buttons slightly more content area" into nyc-dev
-rw-r--r--core/res/res/layout/time_picker_header_material.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/res/res/layout/time_picker_header_material.xml b/core/res/res/layout/time_picker_header_material.xml
index 7019cedbcd25..8fd87b8219b0 100644
--- a/core/res/res/layout/time_picker_header_material.xml
+++ b/core/res/res/layout/time_picker_header_material.xml
@@ -82,7 +82,10 @@
android:id="@+id/am_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
android:layout_marginBottom="-8dp"
android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
android:lines="1"
@@ -96,7 +99,10 @@
android:id="@+id/pm_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
android:lines="1"
android:ellipsize="none"