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

Commit aba3c451 authored by Chiao Cheng's avatar Chiao Cheng Committed by Isaac Katzenelson
Browse files

Major layout change for alarm list. 

- Dim off alarms.
- Adjusted swipe helper to remember the starting alpha of the animated view.
  This is required because an alarm may already be dimmed and thus not at
  1f alpha.
- Change on/off buttons to switch.
- Change expand/collapse target to span width.

Bug: 7323086, 7317880
Change-Id: I9d9f0561c55dc8739372f93a695286123d29db80
parent 08af3126

res/layout/alarm_clock.xml

+2 −4
Original line number Diff line number Diff line
@@ -21,15 +21,13 @@ 
    android:layout_height="match_parent">



    <com.android.deskclock.widget.swipeablelistview.SwipeableListView

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

        android:id="@+id/alarms_list"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="8dp"

        android:paddingRight="8dp"

        android:clipToPadding="false"

        android:descendantFocusability="beforeDescendants"

        android:divider="?android:attr/dividerVertical"

        android:divider="@null"

        android:dividerHeight="6dp"

        />



    <com.android.deskclock.widget.ActionableToastBar

res/layout/alarm_time.xml

+114 −99
Original line number Diff line number Diff line
@@ -16,25 +16,29 @@ 


<com.android.deskclock.widget.swipeablelistview.SwipeLayout

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

    android:id="@+id/alarm_item"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_marginLeft="8dp"

    android:layout_marginRight="8dp"

    android:gravity="center_horizontal|top">

    android:gravity="center_horizontal|top"

    android:background="@color/alarm_whiteish">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="12dp"

        android:layout_marginRight="8dp"

        android:layout_marginTop="12dp"

        android:layout_marginBottom="12dp"

        android:orientation="horizontal">

        <com.android.deskclock.DigitalClock

            android:id="@+id/digital_clock"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="top"

            android:layout_marginLeft="8dp"

            android:layout_marginTop="12dp"

            android:baselineAligned="false">

            android:baselineAligned="false"

            android:clickable="true"

            android:background="@drawable/item_background">

            <com.android.deskclock.ZeroTopPaddingTextView

                android:id="@+id/timeDisplayHours"

                android:layout_width="wrap_content"
@@ -66,63 +70,66 @@ 
            android:layout_height="match_parent"

            android:layout_width="0dip"

            android:layout_weight="1"/>

        <ToggleButton

        <Switch

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:paddingTop="4dp"

            android:paddingBottom="0dp"

            android:paddingLeft="8dp"

            android:paddingRight="8dp"

            style="@style/button"

            android:background="@null"

            android:id="@+id/onoff"

            android:textOn="@string/alarm_on"

            android:textOff="@string/alarm_off"

            android:gravity="top|right"/>

            android:thumbTextPadding="10dp"

            android:layout_gravity="center_vertical|right"/>

    </LinearLayout>

    <LinearLayout

    <View

        android:id="@+id/hairline"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginLeft="8dp"

        android:layout_marginRight="8dp"

        android:background="#28ffffff"/>

    <FrameLayout

        android:id="@+id/info_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="10dp"

        android:gravity="center_vertical">

        android:layout_height="32dp"

        android:paddingLeft="16dp"

        android:gravity="center_vertical"

        android:clickable="true"

        android:background="@drawable/item_background">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginRight="48dp"

            android:gravity="center_vertical"

            >

            <TextView android:id="@+id/label"

                      android:layout_width="wrap_content"

                      android:layout_height="wrap_content"

            style="@style/label"

            android:textColor="@color/clock_gray"/>

                      style="@style/alarm_label"

                      android:textColor="@color/clock_gray"

                      android:ellipsize="end"

                      android:singleLine="true"/>

            <TextView android:id="@+id/daysOfWeek"

                      android:layout_height="wrap_content"

            style="@style/label"

            android:textColor="@color/clock_white"/>

        <Space

            android:layout_height="match_parent"

            android:layout_width="0dip"

            android:layout_weight="1"/>

        <ImageButton

                      android:layout_width="wrap_content"

                      style="@style/alarm_label_bold"

                      android:textColor="@color/clock_white"

                      android:singleLine="true"/>

        </LinearLayout>

        <ImageView

            android:id="@+id/expand"

            android:layout_width="48dp"

            android:layout_height="32dp"

            android:contentDescription="@string/expand_alarm"

            android:src="@drawable/ic_expand_down"

            android:background="@drawable/item_background"/>

    </LinearLayout>

            android:layout_gravity="right"

            />

    </FrameLayout>

    <LinearLayout

        android:id="@+id/expand_area"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone">

        <LinearLayout

            android:orientation="horizontal"

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:minHeight="48dp"

            android:paddingTop="8dp"

            android:paddingLeft="4dp"

            android:paddingRight="8dp"

            android:gravity="center_vertical"

            >



        <TextView

            android:id="@+id/edit_label"

            style="@style/body"
@@ -130,81 +137,89 @@ 
            android:textColor="@color/clock_gray"

            android:inputType="text"

            android:hint="@string/label"

                android:drawableLeft="@drawable/ic_label_small"

                android:drawablePadding="2dp"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

            android:layout_width="wrap_content"

            android:layout_height="64dp"

            android:layout_marginLeft="16dp"

            android:layout_marginRight="16dp"

            android:ellipsize="end"

            android:singleLine="true"

            android:background="@drawable/item_background"/>

        <CheckBox

            android:id="@+id/repeat_onoff"

            android:text="@string/alarm_repeat"

                android:layout_height="wrap_content"

                android:paddingLeft="4dp"

                android:paddingBottom="2dp"

            android:layout_height="48dp"

            android:layout_width="wrap_content"

            android:layout_marginLeft="10dp"

            android:layout_marginRight="16dp"

            android:layout_gravity="center_vertical"

            style="@style/body"

                android:textColor="@color/clock_gray"/>

        </LinearLayout>



            android:textColor="@color/clock_white"/>

        <LinearLayout

            android:id="@+id/repeat_days"

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:minHeight="48dp"

            android:paddingBottom="8dp"

            android:layout_marginLeft="10dp"

            android:layout_marginRight="10dp"

            android:layout_gravity="top"

            android:orientation="horizontal"

            android:visibility="gone">

            <!-- Day buttons are put here programatically -->

        </LinearLayout>

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:minHeight="48dp"

            android:paddingLeft="4dp"

            android:layout_height="64dp"

            android:layout_marginLeft="10dp"

            android:layout_marginRight="16dp"

            android:gravity="center_vertical">

            <Button



            <TextView

                android:id="@+id/choose_ringtone"

                android:layout_height="match_parent"

                android:layout_width="wrap_content"

                android:layout_width="0dp"

                android:layout_weight="1"

                android:layout_marginRight="16dp"

                android:gravity="center_vertical"

                style="@style/body"

                android:paddingRight="8dp"

                android:drawableLeft="@drawable/ic_ringtone"

                android:drawablePadding="2dp"

                android:background="@drawable/item_background"

                android:clickable="true"

                android:textColor="@color/clock_white"/>

        </LinearLayout>

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:minHeight="48dp"

            android:paddingLeft="2dp"

            android:paddingTop="8dp"

            android:paddingBottom="8dp"

            android:clipToPadding="false"

            android:gravity="center_vertical">

                android:textColor="@color/clock_white"

                android:ellipsize="marquee"

                android:scrollHorizontally="true"

                android:singleLine="true"

                android:marqueeRepeatLimit="marquee_forever"

                android:drawableLeft="@drawable/ic_ringtone"

                android:drawablePadding="2dp"

                />

            <CheckBox

                android:id="@+id/vibrate_onoff"

                android:text="@string/alarm_vibrate"

                android:includeFontPadding="false"

                android:paddingLeft="4dp"

                android:paddingBottom="2dp"

                android:textColor="@color/clock_gray"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center_vertical|right"

                style="@style/body"/>

            <Space

                android:layout_height="1dip"

                android:layout_width="0dip"

                android:layout_weight="1"/>

            <ImageButton

        </LinearLayout>

        <View

            android:id="@+id/hairline"

            android:layout_height="1dp"

            android:layout_marginLeft="8dp"

            android:layout_marginRight="8dp"

            android:layout_width="match_parent"

            android:background="#28ffffff"/>

        <FrameLayout

            android:id="@+id/collapse"

                android:layout_width="48dp"

                android:layout_height="48dp"

            android:layout_width="match_parent"

            android:layout_height="32dp"

            android:background="@drawable/item_background"

            android:clickable="true"

            android:contentDescription="@string/collapse_alarm"

            >

            <ImageView

                android:layout_width="48dp"

                android:layout_height="32dp"

                android:src="@drawable/ic_expand_up"

                android:background="@drawable/item_background"/>

            </LinearLayout>

                android:layout_gravity="right"/>

        </FrameLayout>

    </LinearLayout>

</com.android.deskclock.widget.swipeablelistview.SwipeLayout>

res/layout/day_button.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:layout_width="0dp"

    android:layout_height="48dp"

    android:layout_weight="1"

    android:gravity="center"

    style="@style/body"

    android:textColor="@color/clock_gray"

    android:background="@null"/>

res/values/animation_constants.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <integer name="fade_duration">250</integer>



    <!-- Swipe constants -->

    <integer name="swipe_escape_velocity">4000</integer>

    <integer name="swipe_escape_velocity">100</integer>

    <integer name="escape_animation_duration">200</integer>

    <integer name="max_escape_animation_duration">400</integer>

    <integer name="max_dismiss_velocity">2000</integer>

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
    <color name="grey">#ffaaaaaa</color>

    <color name="transparent">#00000000</color>

    <color name="transparent_white">#66ffffff</color>

    <color name="alarm_whiteish">#0cffffff</color>



    <color name="clock_red">#ff4444</color>

    <color name="clock_white">#ffffff</color>