From 3ed7dbaf325baa6edb579becd18b0b89f5a1416d Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 24 Nov 2014 16:12:44 -0800
Subject: [PATCH] Ensure time picker HH:MM header is laid out left-to-right

BUG: 18509792
Change-Id: Iae06469a7a9d019752b869fbd980a9451b2c63b6
---
 core/res/res/layout/time_header_label.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/res/res/layout/time_header_label.xml b/core/res/res/layout/time_header_label.xml
index b1625c7ef734f..07d17665c60b5 100644
--- a/core/res/res/layout/time_header_label.xml
+++ b/core/res/res/layout/time_header_label.xml
@@ -26,13 +26,15 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="bottom"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:layoutDirection="ltr">
 
         <TextView
             android:id="@+id/hours"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="end" />
+            android:gravity="end"
+            android:layoutDirection="locale" />
 
         <TextView
             android:id="@+id/separator"
@@ -40,20 +42,23 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/timepicker_separator_padding"
             android:layout_marginRight="@dimen/timepicker_separator_padding"
-            android:importantForAccessibility="no" />
+            android:importantForAccessibility="no"
+            android:layoutDirection="locale" />
 
         <TextView
             android:id="@+id/minutes"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="start" />
+            android:gravity="start"
+            android:layoutDirection="locale" />
 
         <LinearLayout
             android:id="@+id/ampm_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:baselineAlignedChildIndex="1">
+            android:baselineAlignedChildIndex="1"
+            android:layoutDirection="locale">
             <CheckedTextView
                 android:id="@+id/am_label"
                 android:layout_width="wrap_content"