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

Commit 8d9dd2ee authored by Dylan Phan's avatar Dylan Phan Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where the timer UI didn't fit with huge font size" into ub-deskclock-dazzle

parents d6971004 6bb4aafc

res/values-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


    <dimen name="dialpad_font_size">24sp</dimen>

    <dimen name="dialpad_digit_padding">14dip</dimen>

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

    <dimen name="timer_setup_delete_start_margin">24sp</dimen>

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

res/values-sw360dp-land/dimens.xml

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
  for different hardware and product builds.

-->

<resources>



  <dimen name="circle_size">232dip</dimen>



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

</resources>

res/values-sw360dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ 
<resources>

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

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

    <dimen name="timer_setup_font_size">56sp</dimen>

</resources>
 
 No newline at end of file

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
    <dimen name="dialpad_font_size">36sp</dimen>

    <!--padding should be (in dip) ~ 60% dialpad_font_size -->

    <dimen name="dialpad_digit_padding">22dip</dimen>

    <dimen name="timer_setup_font_size">56sp</dimen>

    <dimen name="timer_setup_font_size">38sp</dimen>

    <dimen name="timer_setup_button_size">24sp</dimen>

    <!--margin should be ~ half timer_setup_font_size -->

    <dimen name="timer_setup_delete_start_margin">28sp</dimen>