Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a21ad1a3 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

parents 6730c3c6 488d2755

core/res/res/layout/time_picker.xml

+23 −16
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <LinearLayout android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layoutDirection="ltr">



        <!-- hour -->

        <NumberPicker

            android:id="@+id/hour"
@@ -44,6 +49,8 @@ 
            android:focusableInTouchMode="true"

            />



    </LinearLayout>



    <!-- AM / PM -->

    <Button

        android:id="@+id/amPm"

core/res/res/layout/time_picker_holo.xml

+37 −30
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <LinearLayout android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layoutDirection="ltr">



        <!-- hour -->

        <NumberPicker

            android:id="@+id/hour"
@@ -60,6 +65,8 @@ 
            android:focusableInTouchMode="true"

            />



    </LinearLayout>



    <!-- AM / PM -->

    <NumberPicker

        android:id="@+id/amPm"