Merge remote-tracking branch 'origin/master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser
2015-06-26 02:44:59 +02:00
23 changed files with 461 additions and 198 deletions

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:singleLine="true"
android:orientation="horizontal"
android:descendantFocusability="blocksDescendants"
android:focusable="false">
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:layout_margin="6dp" />
<include layout="@layout/key_list_item" />
</LinearLayout>