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

Commit 316228fa authored by Robyn Coultas's avatar Robyn Coultas Committed by Isaac Katzenelson
Browse files

Padding between date and digital clock 

BUG: 7615514

New margin to use between digital and date in ClockFragment and ScreenSaver
New left/right/bottom margin for floating portion of the SaverSaver too.

Change-Id: I96babc7c1418e38b93d79d44b52ad4481f2aca2e
parent b69f4084

res/layout/desk_clock_saver.xml

+4 −1
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ 
        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@dimen/screensaver_margin"

        android:layout_marginRight="@dimen/screensaver_margin"

        android:layout_marginTop="@dimen/time_margin_top"

        android:layout_marginBottom="@dimen/time_margin_bottom">

        android:layout_marginBottom="@dimen/screensaver_margin">



    <include layout="@layout/desk_clock_time_date"

        android:id="@+id/digital_clock"
@@ -38,6 +40,7 @@ 
        android:layout_height="wrap_content"

        android:gravity="center"

        android:layout_gravity="center"

        android:layout_marginBottom="@dimen/digital_margin_bottom"

        />

    <com.android.deskclock.AnalogClock

        android:id="@+id/analog_clock"

res/layout/main_clock_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_marginTop="@dimen/time_margin_top"

            android:layout_marginBottom="@dimen/medium_space_bottom"

            android:layout_marginBottom="@dimen/digital_margin_bottom"

            />

    </FrameLayout>

    <LinearLayout

res/values-sw600dp/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
    <dimen name="time_margin_left">8dip</dimen>

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

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

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

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

    <dimen name="ampm_margin_top">15dip</dimen>

    <dimen name="font_margin_adjust">8dip</dimen>

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

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ 
    <dimen name="time_margin_left">8dip</dimen>

    <dimen name="time_margin_bottom">8dip</dimen>

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

    <dimen name="digital_margin_bottom">24dip</dimen>

    <dimen name="timer_padding_left">16dip</dimen>

    <dimen name="screensaver_margin">16dip</dimen>

    <dimen name="ampm_margin_top">8dip</dimen>

    <dimen name="font_margin_adjust">4dip</dimen>

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