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

Commit d746c180 authored by Budi Kusmiantoro's avatar Budi Kusmiantoro
Browse files

Stopwatch lap list to continue behind FAB 

Bug: 18119819

Also adjust laps_list position with layout_weight

Change-Id: I5ef74b65b0cfe091eed99279c62d1771952142a2
parent c7ec2515

res/layout-land/stopwatch_fragment.xml

+6 −7
Original line number Diff line number Diff line
@@ -51,13 +51,12 @@ 


    <ListView

        android:id="@+id/laps_list"

        android:layout_marginTop="32dip"

        android:layout_marginBottom="48dip"

        android:layout_marginStart="@dimen/stopwatch_list_margin_start"

        android:layout_marginEnd="16dip"

        android:layout_gravity="center"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="2"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:layout_gravity="center" />



    <Space

            android:id="@+id/end_space"

res/layout/lap_view.xml

+8 −8
Original line number Diff line number Diff line
@@ -16,32 +16,32 @@ 


<LinearLayout

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

    android:layout_marginTop="4dip"

    android:layout_marginBottom="4dip"

    android:gravity="center"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layoutDirection="ltr"

    android:paddingTop="@dimen/body_font_padding"

    android:paddingBottom="@dimen/body_font_padding"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    android:gravity="center"

    android:orientation="horizontal">



    <TextView

        android:id="@+id/lap_number"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginRight="@dimen/sw_item_space"

        android:layout_marginEnd="@dimen/sw_item_space"

        android:gravity="start"

        android:textAllCaps="false"

        android:textAppearance="@style/SecondaryLabelTextAppearance" />



    <TextView

        android:id="@+id/lap_time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginRight="@dimen/sw_item_space"

        android:layout_marginEnd="@dimen/sw_item_space"

        android:gravity="end"

        android:textAllCaps="false"

        android:textAppearance="@style/PrimaryLabelTextAppearance" />



    <TextView

        android:id="@+id/lap_total"

        android:layout_height="wrap_content"
@@ -49,5 +49,5 @@ 
        android:gravity="end"

        android:textAllCaps="false"

        android:textAppearance="@style/PrimaryLabelTextAppearance" />

</LinearLayout>



</LinearLayout>

res/layout/stopwatch_fragment.xml

+0 −5
Original line number Diff line number Diff line
@@ -61,9 +61,4 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dip" />



    <Space

        android:layout_width="match_parent"

        android:layout_height="@dimen/footer_button_size"

        android:layout_margin="@dimen/footer_button_layout_margin" />



</LinearLayout>

res/layout/stopwatch_spacer.xml

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

<!-- Copyright (C) 2014 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.

-->



<Space

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/stopwatch_list_bottom_spacing" />

res/values-land/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
    <dimen name="medium_font_size">48sp</dimen>



    <dimen name="circle_size">232dip</dimen>

    <dimen name="stopwatch_list_bottom_spacing">0dip</dimen>



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

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