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

Commit b8e3638a authored by Robyn Coultas's avatar Robyn Coultas Committed by Android (Google) Code Review
Browse files

Merge "Basic animation for stopwatch -" into ics-ub-clock-amazon

parents 771c97b1 cffb4dbf

res/layout-land/stopwatch_fragment.xml

+19 −2
Original line number Diff line number Diff line
@@ -16,14 +16,23 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:animateLayoutChanges="true"

    android:orientation="horizontal"

    android:paddingTop="?android:attr/actionBarSize"

    android:baselineAligned="false">



    <Space

            android:id="@+id/start_space"

            android:visibility="gone"

            android:layout_weight="0.5"

            android:layout_width="0dip"

            android:layout_height="match_parent"/>



    <com.android.deskclock.CircleButtonsLayout

        android:id="@+id/stopwatch_circle"

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:animateLayoutChanges="true"

        android:layout_marginLeft="@dimen/circle_margin"

        android:layout_marginStart="@dimen/circle_margin"

        android:layout_marginRight="@dimen/circle_margin"
@@ -82,9 +91,17 @@ 
    <ListView

        android:id="@+id/laps_list"

        android:layout_weight="1"

        android:layout_marginRight="@dimen/sw_right_margin"

        android:layout_marginEnd="@dimen/sw_right_margin"

        android:paddingRight="@dimen/sw_padding_end"

        android:paddingEnd="@dimen/sw_padding_end"

        android:layout_gravity="center"

        android:layout_width="0dip"

        android:layout_height="wrap_content" />



    <Space

            android:id="@+id/end_space"

            android:visibility="gone"

            android:layout_weight="0.5"

            android:layout_width="0dip"

            android:layout_height="match_parent"/>



</LinearLayout>

res/layout/stopwatch_fragment.xml

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:animateLayoutChanges="true"

    android:orientation="vertical"

    android:paddingTop="?android:attr/actionBarSize" >
@@ -23,6 +24,7 @@ 
        android:id="@+id/stopwatch_circle"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:animateLayoutChanges="true"

        android:layout_marginLeft="@dimen/circle_margin"

        android:layout_marginStart="@dimen/circle_margin"

        android:layout_marginRight="@dimen/circle_margin"

res/values-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
    <dimen name="timer_circle_margin">8dp</dimen>



    <dimen name="world_clock_margin">8dp</dimen>

    <dimen name="sw_right_margin">8dp</dimen>

    <dimen name="sw_padding_end">8dp</dimen>



    <!-- Extra offset for timer button paddings. Only nonzero for non-tablets. -->

    <dimen name="timer_button_extra_offset">45dip</dimen>

res/values-sw600dp-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <dimen name="timer_circle_margin">48dp</dimen>



    <dimen name="world_clock_margin">48dp</dimen>

    <dimen name="sw_right_margin">48dp</dimen>

    <dimen name="sw_padding_end">48dp</dimen>



    <!-- Empty space at the edges of the +1 and reset button icons. Based off of 56dip width.-->

    <dimen name="plusone_reset_button_padding">23dip</dimen>

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
    <dimen name="analog_clock_margin">60dp</dimen>

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



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

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



    <!-- The width of the big icons in notifications. -->

    <dimen name="notification_large_icon_width">64dp</dimen>