Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '6ae0a992c8f2a58881f20adcd1e5bc796e85aeef':
  Adjust padding and font size in time picker for Large text mode
This commit is contained in:
Alan Viverette
2015-07-20 23:33:02 +00:00
committed by Android Git Automerger
parent 872cb95cf2 6ae0a992c8
commit d9fa0fd7f3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/layout/time_picker_header_material.xml
View File

@@ -22,7 +22,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" 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, <!-- The hour should always be to the left of the separator,
regardless of the current locale's layout direction. --> regardless of the current locale's layout direction. -->
@@ -68,14 +70,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/minutes" android:layout_toRightOf="@+id/minutes"
android:layout_alignBaseline="@+id/minutes" android:layout_alignBaseline="@+id/minutes"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:orientation="vertical" android:orientation="vertical"
android:baselineAlignedChildIndex="1"> android:baselineAlignedChildIndex="1">
<CheckedTextView <CheckedTextView
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:paddingStart="@dimen/timepicker_ampm_horizontal_padding"
android:paddingEnd="@dimen/timepicker_ampm_horizontal_padding"
android:paddingTop="@dimen/timepicker_am_top_padding" android:paddingTop="@dimen/timepicker_am_top_padding"
android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel" android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
android:lines="1" android:lines="1"
@@ -84,8 +86,6 @@
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:paddingStart="@dimen/timepicker_ampm_horizontal_padding"
android:paddingEnd="@dimen/timepicker_ampm_horizontal_padding"
android:paddingTop="@dimen/timepicker_pm_top_padding" android:paddingTop="@dimen/timepicker_pm_top_padding"
android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel" android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
android:lines="1" android:lines="1"

2
core/res/res/values/dimens_material.xml
View File

@@ -127,7 +127,7 @@
<!-- Text size for the time picker header HH:MM label. This value is large <!-- 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. --> enough that we don't need to use scaled pixels, dp is fine. -->
<dimen name="timepicker_time_label_size">60dp</dimen> <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_ampm_horizontal_padding">16dp</dimen>
<dimen name="timepicker_am_top_padding">4dp</dimen> <dimen name="timepicker_am_top_padding">4dp</dimen>
<dimen name="timepicker_pm_top_padding">4dp</dimen> <dimen name="timepicker_pm_top_padding">4dp</dimen>