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

Commit 45a2e4b9 authored by Robyn Coultas's avatar Robyn Coultas Committed by Isaac Katzenelson
Browse files

Aligning columns in stopwatch lap times 

Bug: 7282042
Bug: 7539981

margin between total and lap times
string-array format for lap# and lap,total times
lap display centered in portrait
optimized landscape layout to give more room for list
using '#' instead of 'LAP'
removed unneeded margins on world clock; new dimen for timer margins
char limit on "Lap" and the hour, minute, second abbreviations
sw list handles times up to 1k hours
circle handles times up to 1k hours

Change-Id: If4e884ffd7b87986024c6d5a5990e529b1d6d736
parent 6f0466d1

res/layout-land/stopwatch_fragment.xml

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:layout_height="match_parent"

        android:layout_marginLeft="@dimen/circle_margin"

        android:layout_marginRight="@dimen/circle_margin"

        android:layout_weight="1" >

        android:layout_weight="0.95" >



        <com.android.deskclock.timer.CountingTimerView

            android:id="@+id/stopwatch_time_text"
@@ -78,8 +78,7 @@ 
    <ListView

        android:id="@+id/laps_list"

        android:layout_weight="1"

        android:layout_marginLeft="@dimen/laps_margin"

        android:layout_marginRight="@dimen/laps_margin"

        android:layout_marginRight="@dimen/sw_right_margin"

        android:layout_gravity="center"

        android:layout_width="0dip"

        android:layout_height="wrap_content" />

res/layout-land/timer_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
        android:id="@+id/timer_frame"

        android:layout_width="@dimen/timer_circle_width"

        android:layout_height="@dimen/timer_circle_diameter"

        android:layout_marginLeft="@dimen/circle_margin"

        android:layout_marginRight="@dimen/circle_margin">

        android:layout_marginLeft="@dimen/timer_circle_margin"

        android:layout_marginRight="@dimen/timer_circle_margin">



        <com.android.deskclock.CircleTimerView

            android:id="@+id/timer_time"

res/layout/lap_view.xml

+5 −7
Original line number Diff line number Diff line
@@ -18,25 +18,24 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_marginTop="4dip"

    android:layout_marginBottom="4dip"

    android:gravity="center"

    android:paddingTop="@dimen/body_font_padding"

    android:paddingBottom="@dimen/body_font_padding"

    android:paddingLeft="@dimen/laps_margin"

    android:paddingRight="@dimen/laps_margin"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/clock_gray"

        android:layout_marginRight="8dip"

        android:layout_marginRight="@dimen/sw_item_space"

        android:gravity="left"

        style="@style/body"

        android:textAllCaps="false"

        android:id="@+id/lap_number" />

    <TextView

        android:layout_width="0dip"

        android:layout_weight="1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginRight="@dimen/sw_item_space"

        android:textColor="@color/clock_gray"

        android:gravity="right"

        style="@style/body"
@@ -44,8 +43,7 @@ 
        android:id="@+id/lap_time" />

    <TextView

        android:layout_height="wrap_content"

        android:layout_width="0dip"

        android:layout_weight="1"

        android:layout_width="wrap_content"

        android:textColor="@color/clock_gray"

        android:gravity="right"

        style="@style/body"

res/layout/timer_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
        android:id="@+id/timer_frame"

        android:layout_width="match_parent"

        android:layout_height="@dimen/timer_circle_diameter"

        android:layout_marginLeft="@dimen/circle_margin"

        android:layout_marginRight="@dimen/circle_margin">

        android:layout_marginLeft="@dimen/timer_circle_margin"

        android:layout_marginRight="@dimen/timer_circle_margin">



        <com.android.deskclock.CircleTimerView

            android:id="@+id/timer_time"

res/layout/world_clock_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginRight="@dimen/circle_margin"

    android:layout_marginLeft="@dimen/circle_margin"

    android:layout_marginRight="@dimen/world_clock_margin"

    android:layout_marginLeft="@dimen/world_clock_margin"

    android:orientation="horizontal">