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

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

Add colons to main clock 

Bug: 10823373
Change-Id: I3cc04f9e02510d0eb1e1c95b88601beba867a9f1
(cherry picked from commit 3d1b3cdc)
parent 9db60209

res/layout/desk_clock_time_date.xml

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2009 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- digital clock & date, together -->

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

    android:id="@+id/time_date"

    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layoutDirection="ltr" >



    <com.android.deskclock.DigitalClock android:id="@+id/time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="top" >



        <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:textSize="@dimen/digital_main_clock_text_size"

            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:textSize="@dimen/digital_main_clock_text_size"

            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:paddingLeft="8dp"

            android:paddingStart="8dp"

            android:singleLine="true"

            android:ellipsize="none"

            android:gravity="top"

            android:textSize="@dimen/main_ampm_font_size"

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



    </com.android.deskclock.DigitalClock>





</LinearLayout>

res/layout/desk_clock_time_small.xml

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- small digital clock for world cities -->

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

    android:id="@+id/digital_clock"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="top"

    android:layoutDirection="ltr" >



    <TextView

        android:id="@+id/timeDisplayHours"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingRight="@dimen/small_time_margin_right"

        android:paddingEnd="@dimen/small_time_margin_right"

        android:singleLine="true"

        android:ellipsize="none"

        style="@style/medium_light"

        android:textSize="@dimen/digital_world_clock_text_size"

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

    <TextView

        android:id="@+id/timeDisplayMinutes"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        style="@style/medium_light"

        android:textSize="@dimen/digital_world_clock_text_size"

        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:textSize="@dimen/digital_world_clock_ampm_text_size"

        android:paddingLeft="@dimen/small_ampm_margin_left"

        android:paddingStart="@dimen/small_ampm_margin_left"

        android:singleLine="true"

        android:ellipsize="none"

        android:gravity="top"

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

</com.android.deskclock.DigitalClock>

res/layout/main_clock_frame.xml

+10 −3
Original line number Diff line number Diff line
@@ -38,14 +38,21 @@ 
            android:hand_hour="@drawable/clock_analog_hour_mipmap"

            android:hand_minute="@drawable/clock_analog_minute_mipmap"

            android:layout_marginBottom="@dimen/bottom_text_spacing_analog" />

        <include layout="@layout/desk_clock_time_date"

        <TextClock

            android:id="@+id/digital_clock"

            android:format12Hour="@string/clock_12_hours_format_with_ampm"

            android:format24Hour="@string/widget_24_hours_format"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_marginTop="@dimen/top_text_spacing_digital"

            android:layout_marginBottom="@dimen/bottom_text_spacing_digital"

            />

            android:singleLine="true"

            android:ellipsize="none"

            style="@style/big_thin"

            android:textSize="@dimen/digital_main_clock_text_size"

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



    </FrameLayout>

    <LinearLayout

        android:layout_width="match_parent"

res/layout/world_clock_item.xml

+12 −4
Original line number Diff line number Diff line
@@ -31,11 +31,19 @@ 
        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="match_parent">

            <include layout="@layout/desk_clock_time_small"

                android:gravity="center"

                android:layout_gravity="center"



            <TextClock

                android:id="@+id/digital_clock"

                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:layout_height="wrap_content"

                style="@style/medium_light"

                android:textSize="@dimen/digital_world_clock_text_size"

                android:textColor="@color/clock_white"

                android:baselineAligned="true"

                android:layout_gravity="center"

                android:gravity="center" />

            <com.android.deskclock.AnalogClock

                android:id="@+id/analog_clock"

                android:gravity="center"

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ 
    <!-- format strings for widget clock -->

    <string name="widget_12_hours_format" translatable="false">h&#58;mm</string>

    <string name="widget_24_hours_format" translatable="false">kk&#58;mm</string>

    <string name="widget_12_hours_format_with_ampm" translatable="false">h&#58;mm&#160;<b><font size="15">a</font></b></string>

    <string name="widget_12_hours_format_with_ampm" translatable="false">h&#58;mm&#160;<b><font size="15" face="sans-serif-condensed">a</font></b></string>

    <string name="clock_12_hours_format_with_ampm" translatable="false">h&#58;mm<b><font size="18" face="sans-serif-condensed">a</font></b></string>



    <!-- String for no alarms -->