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

Commit 59da2c79 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:... 

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

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

Change-Id: I3dcd6731e514757cc30f8c2ab9ee5725fba987e2
parents 460ba08f ef64afe2

core/res/res/layout/time_picker_header_material.xml

+8 −2
Original line number Diff line number Diff line
@@ -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"