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

Commit 70782a0d authored by Budi Kusmiantoro's avatar Budi Kusmiantoro Committed by Android (Google) Code Review
Browse files

Merge "Adjust scrollbar to not overlap with list of city clocks" into lmp-dev

parents 5e469aa1 da98c1a2

res/layout/clock_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="@dimen/clock_side_padding"

        android:paddingEnd="@dimen/clock_side_padding" />

        android:paddingEnd="@dimen/clock_side_padding_reduced" />

    <FrameLayout

        android:layout_width="@dimen/footer_button_size"

        android:layout_height="@dimen/footer_button_size"

res/layout/world_clock_list_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_marginEnd="@dimen/world_clock_margin"

    android:layout_marginLeft="@dimen/world_clock_margin"

    android:layout_marginStart="@dimen/world_clock_margin"

    android:paddingEnd="@dimen/world_clock_end_padding"

    android:orientation="horizontal">



    <include layout="@layout/world_clock_item"

res/values-land/dimens.xml

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


    <dimen name="alarm_side_padding">48dip</dimen>

    <dimen name="clock_side_padding">32dip</dimen>

    <dimen name="world_clock_end_padding">0dip</dimen>



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

res/values-sw600dp/dimens.xml

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


    <dimen name="alarm_side_padding">48dip</dimen>

    <dimen name="clock_side_padding">48dip</dimen>

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



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

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

res/values-sw720dp/dimens.xml

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


    <dimen name="alarm_side_padding">96dip</dimen>

    <dimen name="clock_side_padding">128dip</dimen>

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



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

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