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

Commit a5718e0d authored by George Mount's avatar George Mount
Browse files

Change hour and minute alignment in text TimePicker 

Fixes: 315085352

Flag: EXEMPT bugfix

The "hour" and "minute" text overlap when the fonts
are large. This uses the size of the "hour" text
and the "50sp" minimum to guarantee that the "hour"
can fit. With small fonts, the 50sp is used and the
"hour" is center aligned under the EditText. When
the fonts are large, the "hour" text is used to
size the space and the EditText is aligned to the
right of it.

Similarly, the minute text is center aligned under
its EditText when the fonts are small and left
aligned when the fonts are large.

Test: manual testing with small and large fonts

Change-Id: I8c0e4fba8e425c1959f875662daa5ca087256108
parent 9928e34f

core/res/res/layout/time_picker_text_input_material.xml

+32 −13
Original line number Diff line number Diff line
@@ -34,19 +34,29 @@ 
        android:layoutDirection="ltr">

        <EditText

            android:id="@+id/input_hour"

            android:layout_width="50dp"

            android:layout_width="50sp"

            android:layout_height="wrap_content"

            android:layout_alignEnd="@id/hour_label_holder"

            android:inputType="number"

            android:textAppearance="@style/TextAppearance.Material.TimePicker.InputField"

            android:imeOptions="actionNext"/>

        <!-- Ensure the label_hour takes up at least 50sp of space -->

        <FrameLayout

            android:id="@+id/hour_label_holder"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/input_hour">

            <TextView

                android:id="@+id/label_hour"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:layout_below="@id/input_hour"

            android:layout_alignStart="@id/input_hour"

                android:layout_gravity="center"

                android:labelFor="@+id/input_hour"

                android:text="@string/time_picker_hour_label"/>

            <Space

                android:layout_width="50sp"

                android:layout_height="0dp"/>

        </FrameLayout>



        <TextView

            android:id="@+id/input_separator"
@@ -58,21 +68,30 @@ 


        <EditText

            android:id="@+id/input_minute"

            android:layout_width="50dp"

            android:layout_width="50sp"

            android:layout_height="wrap_content"

            android:layout_alignBaseline="@id/input_hour"

            android:layout_toEndOf="@id/input_separator"

            android:inputType="number"

            android:textAppearance="@style/TextAppearance.Material.TimePicker.InputField" />

        <TextView

            android:id="@+id/label_minute"

        <!-- Ensure the label_minute takes up at least 50sp of space -->

        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/input_minute"

            android:layout_alignStart="@id/input_minute"

            >

            <TextView

                android:id="@+id/label_minute"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:labelFor="@+id/input_minute"

                android:text="@string/time_picker_minute_label"/>



            <Space

                android:layout_width="50sp"

                android:layout_height="0dp"/>

        </FrameLayout>

        <TextView

            android:visibility="invisible"

            android:id="@+id/label_error"