diff options
| -rw-r--r-- | core/res/res/layout/time_picker.xml | 39 | ||||
| -rw-r--r-- | core/res/res/layout/time_picker_holo.xml | 67 |
2 files changed, 60 insertions, 46 deletions
diff --git a/core/res/res/layout/time_picker.xml b/core/res/res/layout/time_picker.xml index 3958fc63d5e2..a78cd85870aa 100644 --- a/core/res/res/layout/time_picker.xml +++ b/core/res/res/layout/time_picker.xml @@ -25,24 +25,31 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <!-- hour --> - <NumberPicker - android:id="@+id/hour" - android:layout_width="70dip" + <LinearLayout android:orientation="horizontal" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - /> + android:layoutDirection="ltr"> - <!-- minute --> - <NumberPicker - android:id="@+id/minute" - android:layout_width="70dip" - android:layout_height="wrap_content" - android:layout_marginStart="5dip" - android:focusable="true" - android:focusableInTouchMode="true" - /> + <!-- hour --> + <NumberPicker + android:id="@+id/hour" + android:layout_width="70dip" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + /> + + <!-- minute --> + <NumberPicker + android:id="@+id/minute" + android:layout_width="70dip" + android:layout_height="wrap_content" + android:layout_marginStart="5dip" + android:focusable="true" + android:focusableInTouchMode="true" + /> + + </LinearLayout> <!-- AM / PM --> <Button diff --git a/core/res/res/layout/time_picker_holo.xml b/core/res/res/layout/time_picker_holo.xml index 765e71d68b3c..7d8900e8b84e 100644 --- a/core/res/res/layout/time_picker_holo.xml +++ b/core/res/res/layout/time_picker_holo.xml @@ -25,40 +25,47 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <!-- hour --> - <NumberPicker - android:id="@+id/hour" + <LinearLayout android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" - android:layout_marginStart="16dip" - android:layout_marginEnd="6dip" - android:focusable="true" - android:focusableInTouchMode="true" - /> + android:layoutDirection="ltr"> - <!-- divider --> - <TextView - android:id="@+id/divider" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:importantForAccessibility="no" - /> + <!-- hour --> + <NumberPicker + android:id="@+id/hour" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dip" + android:layout_marginBottom="16dip" + android:layout_marginStart="16dip" + android:layout_marginEnd="6dip" + android:focusable="true" + android:focusableInTouchMode="true" + /> - <!-- minute --> - <NumberPicker - android:id="@+id/minute" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" - android:layout_marginStart="6dip" - android:layout_marginEnd="8dip" - android:focusable="true" - android:focusableInTouchMode="true" - /> + <!-- divider --> + <TextView + android:id="@+id/divider" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:importantForAccessibility="no" + /> + + <!-- minute --> + <NumberPicker + android:id="@+id/minute" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dip" + android:layout_marginBottom="16dip" + android:layout_marginStart="6dip" + android:layout_marginEnd="8dip" + android:focusable="true" + android:focusableInTouchMode="true" + /> + + </LinearLayout> <!-- AM / PM --> <NumberPicker |