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

Commit 6ca1f8df authored by Annie Chin's avatar Annie Chin
Browse files

Use layout_weight to automatically adjust world clock size. 

Bug: 684838

Revert previous change that hardcoded clock size on sprout to 100dp.

Change-Id: I0c333af1da09eba869e58848bd31d8b0355bdfc6
parent a3e8aded

res/layout/main_clock_frame.xml

+8 −10
Original line number Diff line number Diff line
@@ -19,20 +19,21 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:paddingEnd="@dimen/clock_fragment_end_padding" >

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        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="@dimen/main_world_clock_analog_width"

            android:layout_height="@dimen/main_world_clock_analog_height"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/circle_margin_top"

            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_gravity="center_horizontal"

            android:dial="@drawable/clock_analog_dial_mipmap"

            android:hand_hour="@drawable/clock_analog_hour_mipmap"

            android:hand_minute="@drawable/clock_analog_minute_mipmap"
@@ -41,7 +42,6 @@ 
            android:id="@+id/digital_clock"

            android:format12Hour="@string/main_clock_12_hours_format"

            android:format24Hour="@string/clock_24_hours_format"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"
@@ -51,13 +51,12 @@ 


    </FrameLayout>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center" >

        android:gravity="center_horizontal">

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

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

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

            android:layout_width="wrap_content"
@@ -67,7 +66,6 @@ 
            android:drawablePadding="2dip"

            android:drawableLeft="@drawable/ic_alarm_small"

            android:drawableStart="@drawable/ic_alarm_small"

            android:gravity="center"

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

    </LinearLayout>

res/values-land/dimens.xml

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


    <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

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


  <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

+0 −6
Original line number Diff line number Diff line
@@ -135,12 +135,6 @@ 
    <!-- Bottom padding for alarm lock screen hint text -->

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



    <!-- 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>