diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
| commit | e6af789bf50f9636d3455c4bd1b662ab5d04e3e2 (patch) | |
| tree | 35e7560cd785aa20c1fa814332d16bd094921282 /OpenKeychain/src/main/res/layout/view_key_selectable_user_id_item.xml | |
| parent | 5e53a5417c11f54f437d9f220d3e2e8579b8bf1b (diff) | |
| parent | 145e793db1d732bdd230be92750123cd20c9502d (diff) | |
| download | open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.gz open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.bz2 open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_selectable_user_id_item.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_selectable_user_id_item.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_selectable_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_selectable_user_id_item.xml new file mode 100644 index 000000000..5d0edc916 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_selectable_user_id_item.xml @@ -0,0 +1,18 @@ +<?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:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:singleLine="true"> + + <CheckBox + android:id="@+id/user_id_item_check_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:clickable="false" + android:focusable="false" /> + + <include layout="@layout/view_key_adv_user_id_item" /> + +</LinearLayout> |