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

Commit ccd97086 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Isaac Katzenelson
Browse files

Final adjustments to font sizes 

Bug: 10823373
Change-Id: I807c4606660741b320aeb2c57607249e6005a14b
(cherry picked from commit 50a1b1ea)
parent e4f79e5f

res/values-sw600dp/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <dimen name="font_margin_adjust">8dip</dimen>

    <dimen name="next_alarm_margin_top">-5dip</dimen>

    <dimen name="alarm_label_padding">64dip</dimen>

    <dimen name="bottom_text_size">27sp</dimen>

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

    <dimen name="bottom_text_spacing_digital">-14dp</dimen>

    <dimen name="bottom_text_spacing_analog">18dp</dimen>

    <dimen name="bottom_text_spacing_analog_small">10dp</dimen>
@@ -53,6 +53,7 @@ 
    <dimen name="main_ampm_font_size">33sp</dimen>

    <dimen name="alarm_time_font_size">64sp</dimen>

    <dimen name="no_alarms_font_size">48sp</dimen>

    <dimen name="widget_label_font_size">16sp</dimen>



    <dimen name="body_font_padding">8dp</dimen>

    <dimen name="medium_font_padding">24dp</dimen>

res/values-sw600dp/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -17,8 +17,12 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- format strings for clocks -->

    <!-- Font size for AM/PM should match bottom_text_size -->

    <string name="main_clock_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="27" face="sans-serif-condensed">a</font></b></string>

    <string name="main_clock_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="18" face="sans-serif-condensed">a</font></b></string>

    <!-- Font size for AM/PM should match label_font_size -->

    <string name="world_clock_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="18" face="sans-serif-condensed">a</font></b></string>

    <!-- Font size for AM/PM should match widget_label_font_size -->

    <string name="wc_widget_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="16" face="sans-serif-condensed">a</font></b></string>

    <!-- Font size for AM/PM should match alarm_label_size -->

    <string name="alarm_time_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="18" face="sans-serif-condensed">a</font></b></string>

</resources>

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -807,6 +807,7 @@ 
    <string name="main_clock_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="16" face="sans-serif-condensed">a</font></b></string>

    <!-- Font size for AM/PM should match label_font_size -->

    <string name="world_clock_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="14" face="sans-serif-condensed">a</font></b></string>

    <!-- Font size for AM/PM should match alarm_label_size -->

    <string name="alarm_time_12_hours_format" translatable="false">h&#58;mm&#8202;<b><font size="14" face="sans-serif-condensed">a</font></b></string>



    <!-- String for no alarms -->