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

Commit f84ef35b authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

Add am/pm support and bold hours to widget 

Bug: 7488870, 7476938
Added am/pm support for world clock
Split the TextClock into 2 clocks: hours with bold digits and minutes with thin digits
Added click feedback to main clock.

Change-Id: I1838bc0ae90d18845346336dcb0bb2d8f3521fdf
parent 672e6740

res/layout/digital_widget_time.xml

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

    android:layout_gravity="center"

    android:baselineAligned="false"

    android:background="?android:attr/selectableItemBackground"

    >



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:baselineAligned="true"

        android:layout_gravity="center_horizontal|top">



        <TextClock

            android:id="@+id/the_clock1"

            android:format12Hour="@string/widget_12_hours_format_h"

            android:format24Hour="@string/widget_24_hours_format_h"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/widget_big_bold"

            android:textColor="@color/clock_white"

            android:layout_gravity="center_horizontal|top"

             />

        <TextClock

        android:id="@+id/the_clock"

        android:format12Hour="@string/widget_12_hours_format"

        android:format24Hour="@string/widget_24_hours_format"

            android:id="@+id/the_clock2"

            android:format12Hour="@string/widget_12_hours_format_no_ampm_m"

            android:format24Hour="@string/widget_24_hours_format_m"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/widget_big_thin"

            android:textColor="@color/clock_white"

            android:layout_gravity="center_horizontal|top"

             />



        </LinearLayout>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

res/layout/world_clock_remote_list_item.xml

+51 −18
Original line number Diff line number Diff line
@@ -25,17 +25,33 @@ 
        android:layout_weight="1"

        android:orientation="vertical" >



        <LinearLayout

            android:baselineAligned="true"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content">



            <TextClock

                android:id="@+id/leftClock1"

                android:format12Hour="@string/widget_12_hours_format_h"

                android:format24Hour="@string/widget_24_hours_format_h"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/widget_medium_bold"

                android:textColor="@color/clock_white"

                android:layout_gravity="center"

                android:gravity="center" />

            <TextClock

            android:id="@+id/leftClock"

            android:format12Hour="@string/widget_12_hours_format"

            android:format24Hour="@string/widget_24_hours_format"

                android:id="@+id/leftClock2"

                android:format12Hour="@string/widget_12_hours_format_m"

                android:format24Hour="@string/widget_24_hours_format_m"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/widget_medium_light"

                android:textColor="@color/clock_white"

                android:layout_gravity="center"

                android:gravity="center" />



        </LinearLayout>

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -69,16 +85,33 @@ 
        android:layout_weight="1"

        android:orientation="vertical" >



        <LinearLayout

            android:baselineAligned="true"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content">



            <TextClock

            android:id="@+id/rightClock"

            android:format12Hour="@string/widget_12_hours_format"

            android:format24Hour="@string/widget_24_hours_format"

                android:id="@+id/rightClock1"

                android:format12Hour="@string/widget_12_hours_format_h"

                android:format24Hour="@string/widget_24_hours_format_h"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/widget_medium_bold"

                android:textColor="@color/clock_white"

                android:layout_gravity="center"

                android:gravity="center" />

            <TextClock

                android:id="@+id/rightClock2"

                android:format12Hour="@string/widget_12_hours_format_m"

                android:format24Hour="@string/widget_24_hours_format_m"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/widget_medium_light"

                android:textColor="@color/clock_white"

                android:layout_gravity="center"

                android:gravity="center" />

        </LinearLayout>



        <LinearLayout

            android:layout_width="wrap_content"

res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -732,7 +732,10 @@ 
    <string name="digital_gadget">Digital clock</string>



    <!-- format strings for widget clock -->

    <string name="widget_12_hours_format" translatable="false">h:mm</string>

    <string name="widget_24_hours_format" translatable="false">kk:mm</string>

    <string name="widget_12_hours_format_h" translatable="false">h</string>

    <string name="widget_12_hours_format_no_ampm_m" translatable="false">:mm</string>

    <string name="widget_12_hours_format_m" translatable="false">:mm<font size="15">aa</font></string>

    <string name="widget_24_hours_format_h" translatable="false">kk</string>

    <string name="widget_24_hours_format_m" translatable="false">:mm</string>

</resources>

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ 
        <item name="android:fontFamily">sans-serif</item>

    </style>



    <style name="widget_big_bold" parent="big_bold">

        <item name="android:textSize">@dimen/widget_big_font_size</item>

    </style>



    <style name="big_thin">

        <item name="android:textSize">@dimen/big_font_size</item>

        <item name="android:fontFamily">sans-serif-thin</item>

src/com/android/alarmclock/DigitalAppWidgetProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.Calendar; 


public class DigitalAppWidgetProvider extends AppWidgetProvider {

    private static final String TAG = "DigitalAppWidgetProvider";

    private String mDateFormat = null;

    private String mDateFormat;



    public DigitalAppWidgetProvider() {

    }