Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba682

am: 82dca23713

* commit '82dca237130a7a5035428debbd79285a277af449':
  Give the AM/PM buttons slightly more content area

Change-Id: I92b5abe6d9556f246260fd31fa5c6eadd059bd9f
This commit is contained in:
Alan Viverette
2016-05-16 15:05:15 +00:00
committed by android-build-merger

View File

@@ -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"