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

Commit cbce964b authored by Fan Zhang's avatar Fan Zhang
Browse files

Center the delete icon within button's width. 

Bug: 24732574
Change-Id: Ic2e247129dd8614f3d7bb159ae092e7b4bc8c7d6
parent 94ac3347

res/layout/alarm_time_collapsed.xml

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
            android:layout_width="@dimen/touch_target_min_size"

            android:layout_height="@dimen/touch_target_min_size"

            android:layout_gravity="center_vertical|end"

            android:background="?attr/selectableItemBackground"

            android:contentDescription="@string/expand_alarm"

            android:scaleType="center"

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

res/layout/alarm_time_expanded.xml

+4 −5
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="bottom|start">



            <Button

            <ImageButton

                android:id="@+id/delete"

                android:layout_width="@dimen/touch_target_min_size"

                android:layout_height="@dimen/tall_row_height"
@@ -136,16 +136,15 @@ 
                android:layout_marginBottom="@dimen/alarm_clock_vertical_margin"

                android:background="?attr/selectableItemBackground"

                android:contentDescription="@string/delete_alarm"

                android:drawableStart="@drawable/ic_delete_small"

                android:drawablePadding="@dimen/alarm_horizontal_padding"

                android:gravity="start|center_vertical"

                android:scaleType="fitStart" />

                android:scaleType="center"

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



            <ImageButton

                android:id="@+id/arrow"

                android:layout_width="@dimen/touch_target_min_size"

                android:layout_height="@dimen/touch_target_min_size"

                android:layout_gravity="center_vertical|end"

                android:background="?attr/selectableItemBackground"

                android:contentDescription="@string/collapse_alarm"

                android:rotation="@integer/chevron_rotate_180"

                android:scaleType="center"

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

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 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 +52,7 @@ public final class ExpandedAlarmViewHolder extends AlarmTimeViewHolder { 
    public final CompoundButton[] dayButtons = new CompoundButton[7];

    public final CheckBox vibrate;

    public final TextView ringtone;

    public final Button delete;

    public final ImageButton delete;

    public final View preemptiveDismissContainer;

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


        final int firstDay = Utils.getZeroIndexedFirstDayOfWeek(context);



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

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



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

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