Merge "Adjust vertical padding above trash icon" into lmp-dev

                android:id="@+id/delete"

                android:layout_width="wrap_content"

                android:layout_height="48dip"

                android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

                android:layout_marginBottom="@dimen/alarm_clock_vertical_margin"

                android:layout_marginStart="4dip"

                android:layout_gravity="start"

                android:layout_marginBottom="@dimen/alarm_clock_vertical_margin"

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

                android:contentDescription="@string/delete_alarm"

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

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

    <!-- Bottom margin for the expand area -->

    <dimen name="collapse_expand_height">60dp</dimen>

    <dimen name="collapse_expand_height">72dip</dimen>

    <!-- Divider height -->

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