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

Commit d323a8e7 authored by Annie Chin's avatar Annie Chin
Browse files

Shrink analog clock in world clock tab for 320dp screens. 

Bug: 20707335

Main analog clock was too large, causing date/next alarm to be pushed
off screen. It is now the same size as the time zone analog clocks.

Change-Id: Ie6a7d0b59104ab242b2d745c167e3457ca2e83a2
parent 489cdb01

res/layout/main_clock_frame.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
        android:layout_height="wrap_content">

        <com.android.deskclock.AnalogClock

            android:id="@+id/analog_clock"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_width="@dimen/main_world_clock_analog_width"

            android:layout_height="@dimen/main_world_clock_analog_height"

            android:layout_marginTop="@dimen/circle_margin_top"

            android:layout_marginLeft="@dimen/analog_clock_margin"

            android:layout_marginStart="@dimen/analog_clock_margin"

res/values-land/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -60,4 +60,8 @@ 


    <dimen name="alarm_alert_clock_padding_left">32dp</dimen>



    <!-- Size of big analog clock in world clock. For 320dp landscape, match time zone clocks.-->

    <dimen name="main_world_clock_analog_width">100dp</dimen>

    <dimen name="main_world_clock_analog_height">100dp</dimen>



</resources>

res/values-sw360dp-land/dimens.xml

+5 −1
Original line number Diff line number Diff line
@@ -23,4 +23,8 @@ 


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



  <!-- Size of big analog clock in world clock. -->

  <dimen name="main_world_clock_analog_width">@dimen/match_parent</dimen>

  <dimen name="main_world_clock_analog_height">@dimen/wrap_content</dimen>



</resources>

res/values/dimens.xml

+7 −1
Original line number Diff line number Diff line
@@ -135,7 +135,13 @@ 
    <!-- Bottom padding for alarm lock screen hint text -->

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



    <!-- Size of analog clock in world clock. -->

    <!-- Size of big analog clock in world clock. -->

    <dimen name="match_parent">-1dp</dimen>

    <dimen name="wrap_content">-2dp</dimen>

    <dimen name="main_world_clock_analog_width">@dimen/match_parent</dimen>

    <dimen name="main_world_clock_analog_height">@dimen/wrap_content</dimen>



    <!-- Size of time zone analog clocks in world clock. -->

    <dimen name="world_clock_analog_size">100dip</dimen>

    <dimen name="world_clock_margin">32dp</dimen>