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

Commit dcc49f35 authored by Paul Sliwowski's avatar Paul Sliwowski Committed by Android (Google) Code Review
Browse files

Merge "Update widget styling." into ics-ub-clock-amazon

parents b8e3638a 04c53db8

res/layout-land/alarm_alert.xml

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


            <com.android.deskclock.ZeroTopPaddingTextView

                android:id="@+id/timeDisplayHours"

                style="@style/big_bold"

                style="@style/big_thin"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

res/layout/alarm_alert.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
                android:paddingEnd="@dimen/time_margin_right"

                android:singleLine="true"

                android:ellipsize="none"

                style="@style/big_bold"

                style="@style/big_thin"

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

            <com.android.deskclock.ZeroTopPaddingTextView

                android:id="@+id/timeDisplayMinutes"

res/layout/digital_widget_time.xml

+7 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
        android:layout_height="wrap_content"

        android:baselineAligned="true"

        android:layoutDirection="ltr"

        android:layout_marginBottom="@dimen/bottom_text_spacing_digital"

        android:layout_gravity="center_horizontal|top">



        <TextClock
@@ -37,7 +38,10 @@ 
            android:format24Hour="@string/widget_24_hours_format_h"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/widget_big_bold"

            android:paddingRight="@dimen/widget_big_time_margin_right"

            android:paddingEnd="@dimen/widget_big_time_margin_right"

            android:singleLine="true"

            style="@style/widget_big_thin"

            android:textColor="@color/clock_white"

            android:layout_gravity="center_horizontal|top"

             />
@@ -47,6 +51,7 @@ 
            android:format24Hour="@string/widget_24_hours_format_m"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            style="@style/widget_big_thin"

            android:textColor="@color/clock_white"

            android:layout_gravity="center_horizontal|top"

res/layout/world_clock_remote_list_item.xml

+121 −107
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:id="@+id/widget_item"

    android:orientation="vertical" >



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal" >



        <LinearLayout
@@ -38,7 +43,9 @@ 
                    android:format24Hour="@string/widget_24_hours_format_h"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                style="@style/widget_medium_bold"

                    android:paddingRight="@dimen/widget_medium_time_margin_right"

                    android:paddingEnd="@dimen/widget_medium_time_margin_right"

                    style="@style/widget_medium_thin"

                    android:textColor="@color/clock_white"

                    android:textDirection="ltr"

                    android:layout_gravity="center"
@@ -49,7 +56,7 @@ 
                    android:format24Hour="@string/widget_24_hours_format_m"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                style="@style/widget_medium_light"

                    style="@style/widget_medium_thin"

                    android:textColor="@color/clock_white"

                    android:textDirection="ltr"

                    android:layout_gravity="center"
@@ -102,7 +109,9 @@ 
                    android:format24Hour="@string/widget_24_hours_format_h"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                style="@style/widget_medium_bold"

                    android:paddingRight="@dimen/widget_medium_time_margin_right"

                    android:paddingEnd="@dimen/widget_medium_time_margin_right"

                    style="@style/widget_medium_thin"

                    android:textColor="@color/clock_white"

                    android:textDirection="ltr"

                    android:layout_gravity="center"
@@ -113,7 +122,7 @@ 
                    android:format24Hour="@string/widget_24_hours_format_m"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                style="@style/widget_medium_light"

                    style="@style/widget_medium_thin"

                    android:textColor="@color/clock_white"

                    android:textDirection="ltr"

                    android:layout_gravity="center"
@@ -147,5 +156,10 @@ 
                    android:textColor="@color/clock_gray" />

            </LinearLayout>

        </LinearLayout>



    </LinearLayout>

    <FrameLayout

        android:id="@+id/city_spacer"

        android:layout_width="match_parent"

        android:layout_height="@dimen/digital_widget_city_margin_bottom">

    </FrameLayout>

</LinearLayout>
 
 No newline at end of file

res/values-sw600dp/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ 
    <dimen name="widget_big_font_size">130dp</dimen>

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

    <dimen name="widget_24_medium_font_size">65dp</dimen>

    <dimen name="widget_big_time_margin_right">12dip</dimen>

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

    <dimen name="min_digital_widget_width">335dp</dimen>

    <dimen name="min_digital_widget_height">207dp</dimen>

    <dimen name="min_digital_widget_resize_width">335dp</dimen>
@@ -106,5 +108,5 @@ 
    <dimen name="digital_widget_list_min_scaled_height">263dp</dimen>

    <dimen name="digital_widget_list_min_fixed_height">15dp</dimen>

    <dimen name="digital_widget_list_margin_top">15dp</dimen>



    <dimen name="digital_widget_city_margin_bottom">15dp</dimen>

</resources>