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

Commit 1e3da911 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and... 

am d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev

* commit 'd9fa0fd7':
  Adjust padding and font size in time picker for Large text mode
parents c447689d d9fa0fd7

core/res/res/layout/time_picker_header_material.xml

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 
                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:orientation="horizontal"

                android:padding="@dimen/timepicker_separator_padding">

                android:padding="@dimen/timepicker_separator_padding"

                android:paddingStart="16dp"

                android:paddingEnd="16dp">



    <!-- The hour should always be to the left of the separator,

         regardless of the current locale's layout direction. -->
@@ -68,14 +70,14 @@ 
        android:layout_height="wrap_content"

        android:layout_toRightOf="@+id/minutes"

        android:layout_alignBaseline="@+id/minutes"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:orientation="vertical"

        android:baselineAlignedChildIndex="1">

        <CheckedTextView

            android:id="@+id/am_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/timepicker_ampm_horizontal_padding"

            android:paddingEnd="@dimen/timepicker_ampm_horizontal_padding"

            android:paddingTop="@dimen/timepicker_am_top_padding"

            android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"

            android:lines="1"
@@ -84,8 +86,6 @@ 
            android:id="@+id/pm_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/timepicker_ampm_horizontal_padding"

            android:paddingEnd="@dimen/timepicker_ampm_horizontal_padding"

            android:paddingTop="@dimen/timepicker_pm_top_padding"

            android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"

            android:lines="1"

core/res/res/values/dimens_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
    <!-- Text size for the time picker header HH:MM label. This value is large

         enough that we don't need to use scaled pixels, dp is fine. -->

    <dimen name="timepicker_time_label_size">60dp</dimen>

    <dimen name="timepicker_ampm_label_size">16sp</dimen>

    <dimen name="timepicker_ampm_label_size">16dp</dimen>

    <dimen name="timepicker_ampm_horizontal_padding">16dp</dimen>

    <dimen name="timepicker_am_top_padding">4dp</dimen>

    <dimen name="timepicker_pm_top_padding">4dp</dimen>