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

Commit 19a6a8fb authored by Dylan Phan's avatar Dylan Phan
Browse files

Fix bug where digital clock was too small. 

Bug: 22690473

Also scale am/pm with clock font size across different devices.
Also reduce clock font size for locales that have long am/pm strings.

Change-Id: Ib0a58956909871edffe68cb7fab7d5677533ce84
parent 339006c7

res/layout/desk_clock_saver.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
            android:gravity="center"

            android:singleLine="true"

            android:textColor="@color/clock_white"

            android:textSize="@dimen/screensaver_font_size" />

            android:textSize="@dimen/main_clock_font_size" />



        <com.android.deskclock.AnalogClock

            android:id="@+id/analog_clock"

res/layout/main_clock_frame.xml

+24 −15
Original line number Diff line number Diff line
@@ -16,55 +16,64 @@ 


<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/main_clock_frame"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    android:paddingEnd="@dimen/clock_fragment_end_padding">



    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        android:layout_weight="1">



        <com.android.deskclock.AnalogClock

            android:id="@+id/analog_clock"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/circle_margin_top"

            android:layout_marginBottom="@dimen/bottom_text_spacing_analog"

            android:layout_marginEnd="@dimen/analog_clock_margin"

            android:layout_marginLeft="@dimen/analog_clock_margin"

            android:layout_marginStart="@dimen/analog_clock_margin"

            android:layout_marginRight="@dimen/analog_clock_margin"

            android:layout_marginEnd="@dimen/analog_clock_margin"

            android:layout_marginStart="@dimen/analog_clock_margin"

            android:layout_marginTop="@dimen/circle_margin_top"

            android:dial="@drawable/clock_analog_dial_mipmap"

            android:hand_hour="@drawable/clock_analog_hour_mipmap"

            android:hand_minute="@drawable/clock_analog_minute_mipmap"

            android:layout_marginBottom="@dimen/bottom_text_spacing_analog" />

            android:hand_minute="@drawable/clock_analog_minute_mipmap" />



        <TextClock

            android:id="@+id/digital_clock"

            android:format12Hour="@string/main_clock_12_hours_format"

            android:format24Hour="@string/clock_24_hours_format"

            style="@style/big_thin"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            style="@style/big_thin"

            android:textColor="@color/clock_white" />

            android:format12Hour="@string/main_clock_12_hours_format"

            android:format24Hour="@string/clock_24_hours_format"

            android:singleLine="true"

            android:textColor="@color/clock_white"

            android:textSize="@dimen/main_clock_font_size" />



    </FrameLayout>



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal">

        <TextView android:id="@+id/date"



        <TextView

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="@style/PrimaryLabelTextAppearance" />

        <TextView android:id="@+id/nextAlarm"



        <TextView

            android:id="@+id/nextAlarm"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="8dip"

            android:layout_marginStart="8dip"

            android:drawablePadding="2dip"

            android:drawableLeft="@drawable/ic_alarm_small"

            android:drawablePadding="2dip"

            android:drawableStart="@drawable/ic_alarm_small"

            android:textAppearance="@style/SecondaryLabelTextAppearance" />

    </LinearLayout>

res/values-sw360dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 


<resources>

    <dimen name="big_font_size">70sp</dimen>

    <dimen name="screensaver_font_size">80sp</dimen>

    <dimen name="main_clock_font_size">80sp</dimen>

</resources>
 
 No newline at end of file

res/values-sw400dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->



<resources>

    <dimen name="screensaver_font_size">88sp</dimen>

    <dimen name="main_clock_font_size">88sp</dimen>

</resources>
 
 No newline at end of file

res/values-sw600dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    <dimen name="clock_side_padding">48dip</dimen>

    <dimen name="clock_side_padding_reduced">36dip</dimen>



    <dimen name="screensaver_font_size">160sp</dimen>

    <dimen name="main_clock_font_size">125sp</dimen>

    <dimen name="big_font_size">115sp</dimen>

    <dimen name="medium_font_size">96sp</dimen>

    <dimen name="label_font_size">18sp</dimen>