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

Commit 7b852b43 authored by Christine Franks's avatar Christine Franks
Browse files

Add seconds option for main clock 

Bug: 18594326
Test: Manual - go to settings, toggle setting for displaying seconds,
toggle between analog and digital clocks and toggle display seconds
setting again. Close the app and reopen to test persistence of setting.
On upgrade from old version, current defaults are respected.
Change-Id: I21391929e59f5e8ada77efe446acbc13145478ee
parent fad693ac

res/layout-land/main_clock_frame.xml

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

            android:ellipsize="none"

            android:maxLines="1"

            android:textSize="92sp" />

            android:textSize="@dimen/main_clock_digital_font_size" />



    </FrameLayout>

res/layout/main_clock_frame.xml

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

                android:ellipsize="none"

                android:maxLines="1"

                android:textSize="92sp" />

                android:paddingTop="@dimen/main_clock_digital_padding"

                android:paddingBottom="@dimen/main_clock_digital_padding"

                android:textSize="@dimen/main_clock_digital_font_size" />



        </FrameLayout>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
    <dimen name="alarm_lockscreen_bottom_margin">40dp</dimen>



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

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

    <dimen name="main_clock_digital_padding">24dp</dimen>

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

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

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

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -597,6 +597,8 @@ 
    <string name="clock_settings">Clock</string>

    <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->

    <string name="clock_style">Style</string>

    <!-- Header for a setting referring to showing seconds on the main clock -->

    <string name="display_clock_seconds_pref">Display time with seconds</string>



    <!-- Title for preference to change date & time -->

    <string name="open_date_settings">Change date \u0026 time</string>

res/xml/settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
            android:key="clock_style"

            android:title="@string/clock_style" />



        <SwitchPreferenceCompat

            android:key="display_clock_seconds"

            android:title="@string/display_clock_seconds_pref" />



        <SwitchPreferenceCompat

            android:defaultValue="true"

            android:key="automatic_home_clock"