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

Commit 807ea9f2 authored by Itzhak Katzenelson's avatar Itzhak Katzenelson Committed by Android Git Automerger
Browse files

am 03b13641: Clock widget fixes: 

* commit '03b13641':
  Clock widget fixes:
parents 9101431e 03b13641

res/layout/digital_appwidget.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


    <include layout="@layout/digital_widget_time"

        android:id="@+id/digital_clock"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal|top"

         />

res/layout/digital_widget_time.xml

+12 −23
Original line number Diff line number Diff line
@@ -16,35 +16,24 @@ 


<!-- digital clock for the digital widget -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_gravity="center"

    android:baselineAligned="false"

    >

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center">

        <TextView

            android:id="@+id/timeDisplayHours"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingRight="@dimen/time_margin_right"

            android:singleLine="true"

            android:ellipsize="none"

            style="@style/big_bold"

            android:textColor="@color/clock_white" />

        <TextView

            android:id="@+id/timeDisplayMinutes"



    <TextClock

        android:id="@+id/the_clock"

        android:format12Hour="@string/widget_12_hours_format"

        android:format24Hour="@string/widget_24_hours_format"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            style="@style/big_thin"

            android:singleLine="true"

            android:ellipsize="none"

            android:textColor="@color/clock_white" />

    </LinearLayout>

        style="@style/widget_big_thin"

        android:textColor="@color/clock_white"

        android:layout_gravity="center_horizontal|top"

         />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

res/layout/world_clock_remote_list_item.xml

+14 −44
Original line number Diff line number Diff line
@@ -25,31 +25,16 @@ 
        android:layout_weight="1"

        android:orientation="vertical" >



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:gravity="center" >



            <TextView

                android:id="@+id/timeDisplayHoursLeft"

                style="@style/widget_medium_bold"

        <TextClock

            android:id="@+id/leftClock"

            android:format12Hour="@string/widget_12_hours_format"

            android:format24Hour="@string/widget_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:ellipsize="none"

                android:paddingRight="@dimen/time_margin_right"

                android:singleLine="true"

                android:textColor="@color/clock_white" />



            <TextView

                android:id="@+id/timeDisplayMinutesLeft"

            style="@style/widget_medium_light"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

                android:singleLine="true"

                android:textColor="@color/clock_white" />

        </LinearLayout>

            android:textColor="@color/clock_white"

            android:layout_gravity="center"

            android:gravity="center" />



        <LinearLayout

            android:layout_width="wrap_content"
@@ -84,31 +69,16 @@ 
        android:layout_weight="1"

        android:orientation="vertical" >



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:gravity="center" >



            <TextView

                android:id="@+id/timeDisplayHoursRight"

                style="@style/widget_medium_bold"

        <TextClock

            android:id="@+id/rightClock"

            android:format12Hour="@string/widget_12_hours_format"

            android:format24Hour="@string/widget_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:ellipsize="none"

                android:paddingRight="@dimen/time_margin_right"

                android:singleLine="true"

                android:textColor="@color/clock_white" />



            <TextView

                android:id="@+id/timeDisplayMinutesRight"

            style="@style/widget_medium_light"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

                android:singleLine="true"

                android:textColor="@color/clock_white" />

        </LinearLayout>

            android:textColor="@color/clock_white"

            android:layout_gravity="center"

            android:gravity="center" />



        <LinearLayout

            android:layout_width="wrap_content"

res/values-sw600dp/dimens.xml

+4 −3
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ 
    <dimen name="alarm_label_padding">64dip</dimen>



    <dimen name="big_font_size">220dp</dimen>

    <dimen name="widget_big_font_size">130dp</dimen>

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

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

    <dimen name="widget_medium_font_size">70dp</dimen>

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

    <dimen name="body_font_size">24sp</dimen>
@@ -80,8 +81,8 @@ 


    <dimen name="glowpadview_margin_bottom">0dip</dimen>



    <dimen name="min_digital_widget_width">600dip</dimen>

    <dimen name="min_digital_widget_height">300dip</dimen>

    <dimen name="min_digital_widget_width">200dip</dimen>

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

    <dimen name="min_digital_widget_resize_width">300dip</dimen>

    <dimen name="min_digital_widget_resize_height">150dip</dimen>

res/values/dimens.xml

+4 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
    <dimen name="circletimer_marker_size">16dip</dimen>



    <dimen name="big_font_size">120dp</dimen>

    <dimen name="widget_big_font_size">80dp</dimen>

    <dimen name="small_font_size">48sp</dimen>

    <dimen name="medium_font_size">60dp</dimen>

    <dimen name="widget_medium_font_size">48dp</dimen>
@@ -143,9 +144,9 @@ 
    <dimen name="glowpadview_margin_bottom">-64dip</dimen>

    <dimen name="glowpadview_margin_right">0dip</dimen>



    <dimen name="min_digital_widget_width">300dip</dimen>

    <dimen name="min_digital_widget_width">160dip</dimen>

    <dimen name="min_digital_widget_height">65dip</dimen>

    <dimen name="min_digital_widget_resize_width">200dip</dimen>

    <dimen name="min_digital_widget_resize_height">55dip</dimen>

    <dimen name="min_digital_widget_resize_width">160dip</dimen>

    <dimen name="min_digital_widget_resize_height">65dip</dimen>



</resources>