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

Commit 05338075 authored by Sean Stout's avatar Sean Stout Committed by Android (Google) Code Review
Browse files

Merge "Landscape world clock centered under time display." into ub-deskclock-gatling

parents 365f7b28 c0f19ff8

res/layout-land/clock_fragment.xml

+6 −6
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
        android:layout_height="match_parent"

        android:layout_weight="@integer/gutter_width_percent" />



    <!-- Clock: 64% of total width (4% given to right gutter). -->

    <!-- Clock: 62% of total width (4% given to right gutter). -->

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="64"

        android:layout_weight="62"

        android:gravity="center"

        android:paddingBottom="@dimen/fab_height">
@@ -38,24 +38,24 @@ 
            layout="@layout/main_clock_frame"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="15" />

            android:layout_weight="29" />



        <!-- Right gutter. -->

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1" />

            android:layout_weight="2" />





    </LinearLayout>



    <!-- World Clock List: 32% of total width. Right gutter is applied in world_clock_item. -->

    <!-- World Clock List: 33% of total width. Right gutter is applied in world_clock_item. -->

    <android.support.v7.widget.RecyclerView

        android:id="@+id/cities"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_weight="32"

        android:layout_weight="33"

        android:clickable="false"

        android:clipToPadding="false"

        android:paddingBottom="@dimen/fab_height"

res/layout-land/world_clock_item.xml

+57 −43
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ 
<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="29"

        android:orientation="vertical">



        <FrameLayout
@@ -47,6 +52,7 @@ 
        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:gravity="center">



            <FrameLayout
@@ -76,3 +82,11 @@ 
        </LinearLayout>



    </LinearLayout>



    <!-- Right gutter. -->

    <Space

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="@integer/gutter_width_percent" />



</LinearLayout>