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

Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-11-26 00:07:12 +00:00
committed by Android (Google) Code Review
parent e3c48e9025 3ed7dbaf32
commit ee22218279
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/res/res/layout/time_header_label.xml
View File

@@ -26,13 +26,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="bottom" android:gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal"
android:layoutDirection="ltr">
<TextView <TextView
android:id="@+id/hours" android:id="@+id/hours"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" /> android:gravity="end"
android:layoutDirection="locale" />
<TextView <TextView
android:id="@+id/separator" android:id="@+id/separator"
@@ -40,20 +42,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/timepicker_separator_padding" android:layout_marginLeft="@dimen/timepicker_separator_padding"
android:layout_marginRight="@dimen/timepicker_separator_padding" android:layout_marginRight="@dimen/timepicker_separator_padding"
android:importantForAccessibility="no" /> android:importantForAccessibility="no"
android:layoutDirection="locale" />
<TextView <TextView
android:id="@+id/minutes" android:id="@+id/minutes"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start" /> android:gravity="start"
android:layoutDirection="locale" />
<LinearLayout <LinearLayout
android:id="@+id/ampm_layout" android:id="@+id/ampm_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:baselineAlignedChildIndex="1"> android:baselineAlignedChildIndex="1"
android:layoutDirection="locale">
<CheckedTextView <CheckedTextView
android:id="@+id/am_label" android:id="@+id/am_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"