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

Commit 749b3b31 authored by Robyn Coultas's avatar Robyn Coultas
Browse files

timer setup redlines 

Red line deviations:
Gutter between dial pad digits removed
In landscape time view is centered with dial pad

Change-Id: Ic34c77a6bf38c3ff80b9b2a6a9e30213facb9e90
parent 4c68a4b7

res/layout-land/time_setup_view.xml

+45 −59
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <!-- This nested ltr layout cannot be combined with the parent because

         in RTL, the Keypad and Timer value should swap. -->

    <LinearLayout

        android:id="@+id/timer_time_display"

        android:layoutDirection="ltr"

        android:orientation="horizontal"

        android:layout_weight="3"
@@ -30,32 +31,24 @@ 


        <com.android.deskclock.timer.TimerView

            android:id="@+id/timer_time_text"

            android:layout_width="0dip"

            android:layout_weight="2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/medium_font_padding"

            android:paddingBottom="@dimen/medium_font_padding"

            android:paddingLeft="@dimen/timer_padding_left"

            android:paddingStart="@dimen/timer_padding_left"

            android:layout_gravity="center"

            android:gravity="top"

            >

            android:gravity="center_horizontal|top">



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



        </com.android.deskclock.timer.TimerView>



            <ImageButton

                    android:id="@+id/delete"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:layout_gravity="center"

            android:paddingBottom="@dimen/body_font_padding"

                    android:layout_marginStart="@dimen/timer_setup_delete_start_margin"

                    android:padding="@dimen/timer_setup_delete_padding"

                    android:src="@drawable/ic_backspace"

                    android:background="@drawable/item_background"

            android:contentDescription="@string/timer_delete"

            android:layout_height="match_parent" />

                    android:contentDescription="@string/timer_delete"/>



        </com.android.deskclock.timer.TimerView>



    </LinearLayout>
@@ -81,15 +74,6 @@ 
                layout="@layout/three_keys_view"

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



        <View

                android:layout_width="match_parent"

                android:layout_height="1dip"

                android:layout_marginTop="16dip"/>



        <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="48dip">



        <View

                android:layout_width="match_parent"

                android:layout_height="1dip"
@@ -97,16 +81,18 @@ 


        <LinearLayout

                android:layout_width="match_parent"

                    android:layout_height="wrap_content">

                android:layout_weight="0.5"

                android:layout_height="0dip">



            <Button

                    android:id="@+id/timer_cancel"

                    android:text="@string/timer_cancel"

                        android:layout_width="match_parent"

                        style="@style/button"

                    android:layout_width="0dp"

                    style="@style/bold_button"

                    android:textSize="@dimen/timer_setup_button_size"

                    android:layout_weight="1"

                    android:background="@drawable/item_background"

                        android:layout_height="wrap_content"/>

                    android:layout_height="match_parent"/>



            <View

                    android:id="@+id/timer_button_sep"
@@ -119,15 +105,15 @@ 
            <Button

                    android:id="@+id/timer_start"

                    android:text="@string/timer_start"

                        android:layout_width="match_parent"

                        style="@style/button"

                    android:textSize="@dimen/timer_setup_button_size"

                    android:layout_width="0dp"

                    style="@style/bold_button"

                    android:layout_weight="1"

                    android:background="@drawable/item_background"

                        android:layout_height="wrap_content"/>

                    android:layout_height="match_parent"/>



        </LinearLayout>



        </FrameLayout>

    </LinearLayout>



</LinearLayout>

res/layout-sw600dp/three_keys_view.xml

deleted100644 → 0
+0 −43
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.

-->

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

    android:layout_width="match_parent"

    android:layout_weight="1"

    android:gravity="center"

    android:layoutDirection="ltr"

    android:layout_height="0dip">

    <Button

        android:id="@+id/key_left"

        android:layout_width="0dip"

        android:layout_weight="1"

        style="@style/tablet_dialpad"

        android:background="@drawable/item_background"

        android:layout_height="match_parent" />

    <Button

        android:id="@+id/key_middle"

        android:background="@drawable/item_background"

        android:layout_width="0dip"

        android:layout_weight="1"

        style="@style/tablet_dialpad"

        android:layout_height="match_parent" />

    <Button

        android:id="@+id/key_right"

        android:background="@drawable/item_background"

        android:layout_weight="1"

        android:layout_width="0dip"

        style="@style/tablet_dialpad"

        android:layout_height="match_parent" />

</LinearLayout>

res/layout/three_keys_view.xml

+27 −23
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
              android:gravity="center"

              android:layoutDirection="ltr"

              android:layout_height="0dip">



    <Button

            android:id="@+id/key_left"

            android:layout_width="0dip"
@@ -26,18 +27,21 @@ 
            style="@style/dialpad"

            android:background="@drawable/item_background"

            android:layout_height="match_parent"/>



    <Button

            android:id="@+id/key_middle"

        android:background="@drawable/item_background"

            android:layout_width="0dip"

            android:layout_weight="1"

            style="@style/dialpad"

            android:background="@drawable/item_background"

            android:layout_height="match_parent"/>



    <Button

            android:id="@+id/key_right"

        android:background="@drawable/item_background"

        android:layout_weight="1"

            android:layout_width="0dip"

            android:layout_weight="1"

            style="@style/dialpad"

            android:background="@drawable/item_background"

            android:layout_height="match_parent"/>



</LinearLayout>

res/layout/time_setup_view.xml

+47 −64
Original line number Diff line number Diff line
@@ -18,39 +18,30 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <LinearLayout

        android:orientation="horizontal"

        android:layoutDirection="ltr"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



    <com.android.deskclock.timer.TimerView

            android:id="@+id/timer_time_text"

            android:layout_width="0dip"

            android:layout_weight="2"

            android:layoutDirection="ltr"

            android:orientation="horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/medium_font_padding"

            android:paddingBottom="@dimen/medium_font_padding"

            android:gravity="top|center_horizontal"

            >

            android:gravity="center_horizontal">



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



        </com.android.deskclock.timer.TimerView>



        <ImageButton

                android:id="@+id/delete"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:gravity="center"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center"

            android:paddingBottom="@dimen/body_font_padding"

                android:layout_marginStart="@dimen/timer_setup_delete_start_margin"

                android:padding="@dimen/timer_setup_delete_padding"

                android:src="@drawable/ic_backspace"

                android:background="@drawable/item_background"

            android:contentDescription="@string/timer_delete"

            android:layout_height="match_parent" />

                android:contentDescription="@string/timer_delete"/>



    </LinearLayout>

    </com.android.deskclock.timer.TimerView>



    <View

        android:layout_width="match_parent"
@@ -69,15 +60,6 @@ 
    <include layout="@layout/three_keys_view"

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



    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginTop="16dip" />



    <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="48dip">



    <View

        android:layout_width="match_parent"

        android:layout_height="1dip"
@@ -85,16 +67,18 @@ 


    <LinearLayout

            android:layout_width="match_parent"

                android:layout_height="wrap_content">

            android:layout_weight="0.5"

            android:layout_height="0dip">



        <Button

                android:id="@+id/timer_cancel"

                android:text="@string/timer_cancel"

                    android:layout_width="match_parent"

                    style="@style/button"

                android:layout_width="0dp"

                style="@style/bold_button"

                android:textSize="@dimen/timer_setup_button_size"

                android:layout_weight="1"

                android:background="@drawable/item_background"

                    android:layout_height="wrap_content"/>

                android:layout_height="match_parent"/>



        <View

                android:id="@+id/timer_button_sep"
@@ -107,14 +91,13 @@ 
        <Button

                android:id="@+id/timer_start"

                android:text="@string/timer_start"

                    android:layout_width="match_parent"

                    style="@style/button"

                android:layout_width="0dp"

                style="@style/bold_button"

                android:textSize="@dimen/timer_setup_button_size"

                android:layout_weight="1"

                android:background="@drawable/item_background"

                    android:layout_height="wrap_content"/>

                android:layout_height="match_parent"/>



    </LinearLayout>



    </FrameLayout>



</LinearLayout>

res/layout/timer_fragment.xml

+4 −5
Original line number Diff line number Diff line
@@ -60,10 +60,9 @@ 
            android:id="@+id/timer_setup"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginLeft="8dip"

            android:layout_marginStart="8dip"

            android:layout_marginRight="8dip"

            android:layout_marginEnd="8dip"

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

            android:layout_marginLeft="16dip"

            android:layout_marginStart="16dip"

            android:layout_marginRight="16dip"

            android:layout_marginEnd="16dip"/>



</FrameLayout>