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

Commit 891796a6 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Align all sizes for AM/PM labels" into ics-ub-clock-amazon

parents 4e94eb77 78c03264

res/layout-land/alarm_alert.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 


        <TextClock

            android:id="@+id/digitalClock"

            android:format12Hour="@string/clock_12_hours_format_with_ampm"

            android:format24Hour="@string/widget_24_hours_format"

            android:format12Hour="@string/main_clock_12_hours_format"

            android:format24Hour="@string/clock_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="top"

res/layout/alarm_alert.xml

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 


        <TextClock

            android:id="@+id/digitalClock"

            android:format12Hour="@string/clock_12_hours_format_with_ampm"

            android:format24Hour="@string/widget_24_hours_format"

            android:format12Hour="@string/main_clock_12_hours_format"

            android:format24Hour="@string/clock_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="top"

res/layout/alarm_time.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
            android:baselineAligned="true"

            android:layout_gravity="center"

            android:gravity="center"

            dc:format12Hour="@string/clock_12_hours_format_with_ampm"

            dc:format24Hour="@string/widget_24_hours_format"/>

            dc:format12Hour="@string/alarm_time_12_hours_format"

            dc:format24Hour="@string/clock_24_hours_format"/>

        <Space

            android:layout_height="match_parent"

            android:layout_width="0dip"

res/layout/desk_clock_saver.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 


        <TextClock

            android:id="@+id/digital_clock"

            android:format12Hour="@string/clock_12_hours_format_with_ampm"

            android:format24Hour="@string/widget_24_hours_format"

            android:format12Hour="@string/main_clock_12_hours_format"

            android:format24Hour="@string/clock_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

res/layout/digital_widget_time.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


    <TextClock

        android:id="@+id/the_clock"

        android:format12Hour="@string/widget_12_hours_format"

        android:format24Hour="@string/widget_24_hours_format"

        android:format12Hour="@string/main_widget_12_hours_format"

        android:format24Hour="@string/clock_24_hours_format"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"