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

Commit fc38f194 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Isaac Katzenelson
Browse files

Add colons to alarm alert 

Bug: 10823373
Change-Id: I45f7033d611c2e0b0ec0abf9b3e5ae230c185d8e
(cherry picked from commit 564e58db)
parent 7299e862

res/layout-land/alarm_alert.xml

+9 −33
Original line number Diff line number Diff line
@@ -47,43 +47,19 @@ 
            android:paddingBottom="@dimen/label_margin_small"

            android:singleLine="true" />



        <com.android.deskclock.DigitalClock

        <TextClock

            android:id="@+id/digitalClock"

            android:format12Hour="@string/clock_12_hours_format_with_ampm"

            android:format24Hour="@string/widget_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layoutDirection="ltr"

            android:gravity="top"

            android:paddingBottom="24dp"

            android:baselineAligned="true"

            android:gravity="top" >



            <TextView

                android:id="@+id/timeDisplayHours"

                style="@style/big_thin"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

                android:paddingRight="@dimen/time_margin_right"

                android:paddingEnd="@dimen/time_margin_right"

            android:singleLine="true"

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



            <TextView

                android:id="@+id/timeDisplayMinutes"

                style="@style/big_thin"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

                android:singleLine="true"

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



            <TextView

                android:id="@+id/am_pm"

                style="@style/label"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:ellipsize="none"

                android:singleLine="true"

            style="@style/big_thin"

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

        </com.android.deskclock.DigitalClock>

    </LinearLayout>



    <com.android.deskclock.widget.multiwaveview.GlowPadView

res/layout/alarm_alert.xml

+7 −31
Original line number Diff line number Diff line
@@ -41,43 +41,19 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <com.android.deskclock.DigitalClock

        <TextClock

            android:id="@+id/digitalClock"

            android:format12Hour="@string/clock_12_hours_format_with_ampm"

            android:format24Hour="@string/widget_24_hours_format"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="top"

            android:layoutDirection="ltr"

            android:paddingBottom="24dp"

            android:baselineAligned="true"

            >

            <TextView

                android:id="@+id/timeDisplayHours"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingRight="@dimen/time_margin_right"

                android:paddingEnd="@dimen/time_margin_right"

            android:singleLine="true"

            android:ellipsize="none"

            style="@style/big_thin"

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

            <TextView

                android:id="@+id/timeDisplayMinutes"

                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"/>

            <TextView

                android:id="@+id/am_pm"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                style="@style/label"

                android:singleLine="true"

                android:ellipsize="none"

                android:textColor="@color/clock_white"

                />

        </com.android.deskclock.DigitalClock>

    </LinearLayout>



    <com.android.deskclock.widget.multiwaveview.GlowPadView