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

Commit 95f96e74 authored by Budi Kusmiantoro's avatar Budi Kusmiantoro Committed by Android Git Automerger
Browse files

am 56fac408: Merge "Timer UX polish" into lmp-dev 

* commit '56fac408':
  Timer UX polish
parents 6538cf4a 56fac408

res/layout-land/time_setup_view.xml

+1 −11
Original line number Diff line number Diff line
@@ -87,16 +87,6 @@ 


    </LinearLayout>



    <ImageButton

        android:id="@+id/timer_cancel"

        style="@style/button"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/footer_button_size"

        android:layout_marginTop="@dimen/footer_button_layout_margin"

        android:layout_marginBottom="@dimen/footer_button_layout_margin"

        android:layout_marginEnd="@dimen/timer_cancel_end_margin"

        android:layout_gravity="bottom|center"

        android:contentDescription="@string/timer_cancel"

        android:src="@drawable/ic_cancel" />

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



</FrameLayout>
 
 No newline at end of file

res/layout/time_setup_view.xml

+1 −11
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ 
        android:id="@+id/fourth"

        layout="@layout/three_keys_view" />



    <ImageButton

        android:id="@+id/timer_cancel"

        style="@style/button"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/footer_button_size"

        android:layout_marginTop="@dimen/footer_button_layout_margin"

        android:layout_marginBottom="@dimen/footer_button_layout_margin"

        android:layout_marginEnd="@dimen/timer_cancel_end_margin"

        android:layout_gravity="center"

        android:contentDescription="@string/timer_cancel"

        android:src="@drawable/ic_cancel" />

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



</LinearLayout>

res/layout/timer_cancel_button.xml

0 → 100644
+40 −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.

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/footer_button_size"

    android:layout_gravity="bottom"

    android:orientation="horizontal">



    <ImageButton

        android:id="@+id/timer_cancel"

        style="@style/button"

        android:layout_width="0dip"

        android:layout_weight="1"

        android:layout_height="match_parent"

        android:paddingEnd="20dip"

        android:contentDescription="@string/timer_cancel"

        android:src="@drawable/ic_cancel" />



    <Space

        android:layout_width="0dip"

        android:layout_weight="2"

        android:layout_height="match_parent">

    </Space>



</LinearLayout>

res/layout/timer_list_item.xml

+1 −3
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:gravity="center_vertical"

    android:paddingBottom="@dimen/footer_button_size"

    android:layout_marginBottom="@dimen/footer_button_layout_margin"

    android:paddingBottom="@dimen/timer_list_padding_bottom"

    android:orientation="vertical">



    <com.android.deskclock.CircleButtonsLayout
@@ -50,7 +49,6 @@ 
            android:layout_gravity="top|center_horizontal"

            android:layout_marginTop="0dip"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:clickable="true"

            android:contentDescription="@string/label">



            <TextView

res/layout/timer_timer_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="end|center_vertical"

        android:layout_marginEnd="24dip"

        android:gravity="center"

        android:orientation="vertical">
@@ -53,7 +54,8 @@ 
        <Space

            android:layout_width="match_parent"

            android:layout_height="@dimen/footer_button_size"

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

            android:layout_marginTop="@dimen/footer_button_layout_margin"

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



    </LinearLayout>