Merge with upstream

This commit is contained in:
doompadee 2017-12-24 23:52:55 +01:00
commit 46a60e1ae8

View file

@ -4,41 +4,53 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:focusable="true" android:focusable="true"
android:minHeight="48dp" android:foreground="?attr/rectSelector"
android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="24dp" android:paddingEnd="@dimen/md_dialog_frame_margin"
android:paddingLeft="24dp" android:paddingLeft="@dimen/md_dialog_frame_margin"
android:paddingRight="24dp" android:paddingRight="@dimen/md_dialog_frame_margin"
android:paddingStart="24dp"> android:paddingStart="@dimen/md_dialog_frame_margin"
tools:gravity="start|center_vertical">
<android.support.v7.widget.AppCompatCheckBox <com.kabouzeid.appthemehelper.common.views.ATECheckBox
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:focusable="false" /> android:focusable="false"
android:gravity="center_vertical" />
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical"
android:minHeight="@dimen/md_listitem_height"
android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
android:paddingLeft="@dimen/md_listitem_control_margin"
android:paddingStart="@dimen/md_listitem_control_margin"
android:paddingTop="@dimen/md_listitem_vertical_margin_choice"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/md_listitem_textsize"
tools:text="Item" /> tools:text="Item" />
<View <com.kabouzeid.gramophone.views.IconImageView
android:id="@+id/drag_handle" android:id="@+id/drag_view"
android:layout_width="48dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="end|center_vertical"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:minWidth="48dp" android:minHeight="@dimen/md_listitem_height"
android:minHeight="40dp" /> android:tint="?attr/iconColor"
android:tintMode="src_in"
app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
tools:ignore="ContentDescription" />
</LinearLayout> </LinearLayout>