Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2baf0859 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

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

am: 82dca237

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

Change-Id: I92b5abe6d9556f246260fd31fa5c6eadd059bd9f
parents b2d511be 82dca237
Loading
Loading
Loading
Loading
+8 −2
Original line number Original line Diff line number Diff line
@@ -82,7 +82,10 @@
            android:id="@+id/am_label"
            android:id="@+id/am_label"
            android:layout_width="wrap_content"
            android:layout_width="wrap_content"
            android:layout_height="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:layout_marginBottom="-8dp"
            android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
            android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
            android:lines="1"
            android:lines="1"
@@ -96,7 +99,10 @@
            android:id="@+id/pm_label"
            android:id="@+id/pm_label"
            android:layout_width="wrap_content"
            android:layout_width="wrap_content"
            android:layout_height="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:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
            android:lines="1"
            android:lines="1"
            android:ellipsize="none"
            android:ellipsize="none"