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

Commit 4071666b authored by Annie Chin's avatar Annie Chin
Browse files

Polish predismiss UI. 

Left-align icons, line up text, extend hairlines.

Bug: 23590914
Change-Id: Ifdad12d582c1cc79472252f6612e3337f41fbfe0
parent 3c16d20d

res/layout/alarm_time_collapsed.xml

+4 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
            android:layout_width="match_parent"

            android:layout_height="@dimen/hairline_height"

            android:layout_gravity="bottom"

            android:layout_marginEnd="8dp"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="@dimen/icon_margin"

            android:layout_marginStart="@dimen/icon_margin"

            android:background="@color/hairline" />



        <com.android.deskclock.widget.EllipsizeLayout
@@ -52,7 +52,8 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

                android:paddingEnd="4dip"

                android:paddingStart="@dimen/icon_margin"

                android:paddingEnd="@dimen/icon_margin"

                android:singleLine="true"

                android:textColor="@color/clock_gray"

                android:textSize="@dimen/alarm_text_font_size" />

res/layout/alarm_time_expanded.xml

+21 −22
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
            <CheckBox

                android:id="@+id/repeat_onoff"

                android:layout_width="wrap_content"

                android:layout_height="48dip"

                android:layout_height="@dimen/touch_target_min_size"

                android:layout_gravity="center_vertical|start"

                android:paddingStart="12dip"

                android:paddingStart="@dimen/alarm_side_padding"

                android:text="@string/alarm_repeat"

                android:textColor="@color/clock_white"

                android:textSize="@dimen/alarm_text_font_size" />
@@ -50,7 +50,7 @@ 
            <LinearLayout

                android:id="@+id/repeat_days"

                android:layout_width="match_parent"

                android:layout_height="48dip"

                android:layout_height="@dimen/touch_target_min_size"

                android:layout_gravity="top"

                android:orientation="horizontal"

                android:visibility="gone" />
@@ -64,17 +64,16 @@ 
                <TextView

                    android:id="@+id/choose_ringtone"

                    android:layout_width="0dip"

                    android:layout_height="48dip"

                    android:layout_height="@dimen/touch_target_min_size"

                    android:layout_weight="1"

                    android:layout_alignParentStart="true"

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

                    android:clickable="true"

                    android:drawablePadding="16dp"

                    android:drawablePadding="@dimen/alarm_horizontal_padding"

                    android:drawableStart="@drawable/ic_ringtone"

                    android:ellipsize="marquee"

                    android:gravity="center_vertical"

                    android:marqueeRepeatLimit="marquee_forever"

                    android:paddingStart="4dip"

                    android:paddingStart="@dimen/icon_margin"

                    android:scrollHorizontally="true"

                    android:singleLine="true"

                    android:textAlignment="viewStart"
@@ -84,11 +83,11 @@ 
                <CheckBox

                    android:id="@+id/vibrate_onoff"

                    android:layout_width="wrap_content"

                    android:layout_height="48dip"

                    android:layout_height="@dimen/touch_target_min_size"

                    android:layout_alignParentEnd="true"

                    android:layout_centerVertical="true"

                    android:includeFontPadding="false"

                    android:paddingStart="16dip"

                    android:paddingStart="@dimen/alarm_horizontal_padding"

                    android:text="@string/alarm_vibrate"

                    android:textColor="@color/white"

                    android:textSize="@dimen/alarm_text_font_size" />
@@ -102,20 +101,18 @@ 
                android:ellipsize="end"

                android:hint="@string/label"

                android:paddingBottom="12dp"

                android:paddingEnd="12dp"

                android:paddingLeft="18dp"

                android:paddingRight="12dp"

                android:paddingStart="18dp"

                android:paddingEnd="@dimen/alarm_side_padding"

                android:paddingStart="44dp"

                android:paddingTop="12dp"

                android:singleLine="true"

                android:textColor="@color/white"

                android:textSize="@dimen/alarm_text_font_size" />



            <View

                android:layout_width="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/hairline_height"

                android:layout_marginEnd="@dimen/alarm_side_padding"

                android:layout_marginStart="@dimen/alarm_side_padding"

                android:layout_marginEnd="@dimen/hairline_side_padding"

                android:layout_marginStart="@dimen/hairline_side_padding"

                android:background="@color/hairline" />



            <include
@@ -128,19 +125,21 @@ 
            android:id="@+id/collapse_expand"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom">

            android:layout_gravity="bottom|start">



            <ImageButton

            <Button

                android:id="@+id/delete"

                android:layout_width="@dimen/touch_target_min_size"

                android:layout_height="@dimen/touch_target_min_size"

                android:layout_height="@dimen/tall_row_height"

                android:layout_gravity="center_vertical|start"

                android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

                android:layout_marginBottom="@dimen/alarm_clock_vertical_margin"

                android:layout_marginStart="4dip"

                android:background="?attr/selectableItemBackground"

                android:contentDescription="@string/delete_alarm"

                android:scaleType="center"

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

                android:drawableStart="@drawable/ic_delete_small"

                android:drawablePadding="@dimen/alarm_horizontal_padding"

                android:gravity="start|center_vertical"

                android:scaleType="fitStart" />



            <ImageButton

                android:id="@+id/arrow"

res/layout/preemptive_dismiss.xml

+7 −6
Original line number Diff line number Diff line
@@ -24,21 +24,22 @@ 
    <Button

        android:id="@+id/preemptive_dismiss_button"

        android:layout_width="match_parent"

        android:layout_height="@dimen/touch_target_min_size"

        android:layout_height="@dimen/tall_row_height"

        android:background="?attr/selectableItemBackground"

        android:drawableStart="@drawable/ic_alarm_off_white_24dp"

        android:drawablePadding="@dimen/dismiss_icon_padding"

        android:drawablePadding="@dimen/alarm_horizontal_padding"

        android:gravity="start|center_vertical"

        android:paddingStart="@dimen/icon_margin"

        android:textAllCaps="false"

        android:textColor="@color/clock_white"

        android:textSize="@dimen/alarm_text_font_size" />



    <View

        android:id="@+id/preemptive_dismiss_hairline"

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/hairline_height"

        android:layout_marginEnd="@dimen/alarm_side_padding"

        android:layout_marginStart="@dimen/alarm_side_padding"

        android:layout_marginEnd="@dimen/hairline_side_padding"

        android:layout_marginStart="@dimen/hairline_side_padding"

        android:background="@color/hairline" />



</LinearLayout>

res/values/dimens.xml

+11 −2
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ 
    <!-- Divider height -->

    <dimen name="hairline_height">1dip</dimen>



    <!-- Divider side padding -->

    <dimen name="hairline_side_padding">6dp</dimen>



    <!-- The minimum height/width of any touch target -->

    <dimen name="touch_target_min_size">48dip</dimen>
@@ -191,8 +194,14 @@ 
    <dimen name="fastscroll_preview_padding">8dp</dimen>

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



    <!-- Dimens for dismiss icon padding on Alarms tab -->

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

    <!-- Dimens for drawable padding on Alarms tab -->

    <dimen name="alarm_horizontal_padding">16dp</dimen>



    <!-- Dimens for icon padding on Alarms tab -->

    <dimen name="icon_margin">4dp</dimen>



    <!-- Dimens for taller rows on Alarms tab -->

    <dimen name="tall_row_height">58dp</dimen>



    <!-- Floating action button style -->

    <dimen name="fab_margin">0dp</dimen>

src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.LayerDrawable;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.Button;

import android.widget.CheckBox;

import android.widget.CompoundButton;

import android.widget.ImageButton;

import android.widget.LinearLayout;

import android.widget.TextView;
@@ -51,7 +51,7 @@ public final class ExpandedAlarmViewHolder extends AlarmTimeViewHolder { 
    public final CompoundButton[] dayButtons = new CompoundButton[7];

    public final CheckBox vibrate;

    public final TextView ringtone;

    public final ImageButton delete;

    public final Button delete;

    public final View preemptiveDismissContainer;

    public final TextView preemptiveDismissButton;
@@ -78,7 +78,7 @@ public final class ExpandedAlarmViewHolder extends AlarmTimeViewHolder { 


        final int firstDay = Utils.getZeroIndexedFirstDayOfWeek(context);



        delete = (ImageButton) itemView.findViewById(R.id.delete);

        delete = (Button) itemView.findViewById(R.id.delete);



        repeat = (CheckBox) itemView.findViewById(R.id.repeat_onoff);

        vibrate = (CheckBox) itemView.findViewById(R.id.vibrate_onoff);