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

Commit 9814bd45 authored by Robyn Coultas's avatar Robyn Coultas Committed by Itzhak Katzenelson
Browse files

Sort world clocks by timezone, name 

Bug: 7302953, 7224695
Change-Id: Iced89dad5ba034337f39a4c1e348a06e9bb9c1a7
parent 2e5e0ec8

res/layout/main_clock_frame.xml

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ 
            <TextView android:id="@+id/slash_digital"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="4dip"

                android:layout_marginRight="4dip"

                android:layout_marginLeft="@dimen/style_label_space"

                android:layout_marginRight="@dimen/style_label_space"

                android:textColor="@color/clock_gray"

                android:text="@string/slash"

                style="@style/label"

res/layout/world_clock_item.xml

+8 −12
Original line number Diff line number Diff line
@@ -20,17 +20,15 @@ 
    android:layout_height="wrap_content"

    android:paddingBottom="@dimen/medium_space"

    android:orientation="vertical">

    <TextView

    <LinearLayout

        android:id="@+id/city_name_digital"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginBottom="@dimen/label_margin_small"

        android:layout_marginLeft="@dimen/label_margin_small"

        style="@style/label"

        android:singleLine="true"

        android:ellipsize="none"

        android:textColor="@color/clock_white"

        />

        >

        <include layout="@layout/world_clock_label"/>

    </LinearLayout>

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content">
@@ -47,16 +45,14 @@ 
            android:hand_hour="@drawable/clock_analog_hour"

            android:hand_minute="@drawable/clock_analog_minute"/>

    </FrameLayout>

    <TextView

    <LinearLayout

        android:id="@+id/city_name_analog"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/label_margin_small"

        android:layout_marginLeft="@dimen/label_margin_small"

        style="@style/label"

        android:singleLine="true"

        android:ellipsize="none"

        android:gravity="center"

        android:textColor="@color/clock_white"

        />

        >

        <include layout="@layout/world_clock_label"/>

    </LinearLayout>

</LinearLayout>

res/layout/world_clock_label.xml

0 → 100644
+38 −0
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.

-->

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



    <TextView

        android:id="@+id/city_name"

        style="@style/label"

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

        style="@style/label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@dimen/style_label_space"

        android:ellipsize="none"

        android:singleLine="true"

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



</merge>

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 


    <dimen name="small_space">16dp</dimen>

    <dimen name="medium_space">32dp</dimen>

    <dimen name="style_label_space">4dip</dimen>



    <dimen name="label_margin_big">4dp</dimen>

    <dimen name="label_margin_small">2dp</dimen>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -646,6 +646,8 @@ 
    <string name="alarm_deleted">Alarm deleted.</string>

    <!-- slash between date and next alarm in the clock -->

    <string name="slash"> / </string>

    <!-- slash between date and next alarm in the clock -->

    <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>



</resources>