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

Merge "Fix bug #7198224 TimePicker widget shouldn't be completely RTL" into jb-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-09-20 16:54:08 -07:00
committed by Android (Google) Code Review
parent 6730c3c69f 488d275536
commit a21ad1a394
2 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/res/res/layout/time_picker.xml
View File

@@ -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

67
core/res/res/layout/time_picker_holo.xml
View File

@@ -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