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

Commit 5e03fe74 authored by James Kung's avatar James Kung Committed by Android (Google) Code Review
Browse files

Merge "Timeline view empty states" into ics-ub-clock-amazon

parents d661eef2 5aa304e1

res/layout-sw600dp-land/alarm_clock.xml

+40 −38
Original line number Diff line number Diff line
@@ -22,57 +22,32 @@ 
    android:paddingTop="?android:attr/actionBarSize" >



    <LinearLayout

        android:id="@+id/alarm_layout"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:baselineAligned="false" >



        <FrameLayout

            android:layout_width="0dip"

            android:layout_height="match_parent"

            android:layout_weight="2"

            >

        <ListView

            android:id="@+id/alarms_list"

                android:layout_width="match_parent"

            android:layout_width="0dip"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:clipToPadding="false"

            android:descendantFocusability="beforeDescendants"

            android:divider="@null"

            android:dividerHeight="6dp"

            />

            <TextView

                android:id="@+id/alarms_empty_view"

                style="@style/no_alarms"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:contentDescription="@string/no_alarms"

                android:drawableTop="@drawable/ic_noalarms"

                android:text="@string/no_alarms"

                android:textColor="#4cffffff"

                android:paddingBottom="88dp" />

            <com.android.deskclock.widget.ActionableToastBar

                android:id="@+id/undo_bar"

                android:layout_width="match_parent"

                android:layout_height="64dip"

                android:layout_gravity="bottom"

                android:layout_marginBottom="96dp"

                android:layout_marginLeft="8dp"

                android:layout_marginStart="8dp"

                android:layout_marginRight="8dp"

                android:layout_marginEnd="8dp"

                style="@style/ToastBarStyle" />

        </FrameLayout>



        <include layout="@layout/alarm_timeline_layout"

            android:layout_width="0dip"

            android:id="@+id/timeline_layout"

            android:layout_width="@dimen/alarm_timeline_layout_width"

            android:layout_height="match_parent"

            android:layout_weight="1"

        />



    </LinearLayout>



    <FrameLayout

        android:id="@+id/alarms_footer_view"

        android:background="@drawable/footer_bg"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -102,4 +77,31 @@ 
            android:layout_width="@dimen/footer_button_size"

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

    </FrameLayout>

    <TextView

            android:id="@+id/alarms_empty_view"

            style="@style/no_alarms"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:contentDescription="@string/no_alarms"

            android:drawableTop="@drawable/ic_noalarms"

            android:text="@string/no_alarms"

            android:textColor="#4cffffff"

            android:paddingBottom="88dp" />

    <FrameLayout android:id="@+id/undo_frame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone" >

        <com.android.deskclock.widget.ActionableToastBar

            android:id="@+id/undo_bar"

            android:layout_width="match_parent"

            android:layout_height="64dip"

            android:layout_gravity="bottom"

            android:layout_marginBottom="96dp"

            android:layout_marginLeft="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginStart="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginRight="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginEnd="@dimen/alarm_undo_bar_horizontal_margin"

            style="@style/ToastBarStyle" />

    </FrameLayout>

</FrameLayout>

res/layout/alarm_clock.xml

+17 −10
Original line number Diff line number Diff line
@@ -43,18 +43,25 @@ 
        android:textColor="#4cffffff"

        android:paddingBottom="88dp" />



    <FrameLayout android:id="@+id/undo_frame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone" >

        <com.android.deskclock.widget.ActionableToastBar

            android:id="@+id/undo_bar"

            android:layout_width="match_parent"

            android:layout_height="64dip"

            android:layout_gravity="bottom"

            android:layout_marginBottom="96dp"

        android:layout_marginLeft="8dp"

        android:layout_marginStart="8dp"

        android:layout_marginRight="8dp"

        android:layout_marginEnd="8dp"

            android:layout_marginLeft="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginStart="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginRight="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginEnd="@dimen/alarm_undo_bar_horizontal_margin"

            style="@style/ToastBarStyle" />

    </FrameLayout>



    <FrameLayout

        android:id="@+id/alarms_footer_view"

        android:background="@drawable/footer_bg"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

res/layout/alarm_time.xml

+5 −0
Original line number Diff line number Diff line
@@ -238,4 +238,9 @@ 
            </com.android.deskclock.widget.EllipsizeLayout>

        </FrameLayout>

    </FrameLayout>

    <View android:id="@+id/alarm_footer_filler"

        android:visibility="gone"

        android:layout_width="match_parent"

        android:background="@color/blackish"

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

</LinearLayout>

res/layout/alarm_timeline_layout.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:orientation="vertical"

    >

    <TextView

        android:id="@+id/alarm_timeline_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/alarm_timeline_title_margin_bottom"
@@ -30,10 +31,12 @@ 
        android:textColor="@color/clock_red"

        android:gravity="center_horizontal" />

    <ScrollView

        android:id="@+id/alarm_timeline_scroll_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent" >

        <com.android.deskclock.AlarmTimelineView

            android:id="@+id/alarm_timeline_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

            android:layout_height="wrap_content" />

    </ScrollView>

</LinearLayout>
 
 No newline at end of file

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
    <dimen name="footer_button_size">56dip</dimen>

    <dimen name="footer_button_layout_margin">16dip</dimen>



    <dimen name="alarm_timeline_layout_width">350dp</dimen>

    <dimen name="alarm_timeline_width">2dp</dimen>

    <dimen name="alarm_timeline_margin_top">50dp</dimen>

    <dimen name="alarm_timeline_length">1200dp</dimen>
@@ -70,6 +71,7 @@ 
    <dimen name="alarm_timeline_layout_padding_top">50dp</dimen>

    <dimen name="alarm_timeline_title_margin_bottom">10dp</dimen>

    <dimen name="alarm_timeline_title_text_size">24dp</dimen>

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

    <dimen name="circletimer_dot_size">12dip</dimen>

    <dimen name="circletimer_circle_size">4dip</dimen>

    <dimen name="circletimer_marker_size">16dip</dimen>