diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_subkey_item.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_subkey_item.xml | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml index 226ed52cf..af7e32039 100644 --- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml @@ -6,36 +6,39 @@ android:orientation="horizontal" android:singleLine="true"> - <ImageView - android:id="@+id/ic_masterKey" + <FrameLayout + android:id="@+id/subkey_item_buttons" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:src="@drawable/key_small" - android:padding="8dp" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/user_id_item_edit_image" - android:src="@drawable/ic_action_edit" - android:padding="8dp" android:layout_centerVertical="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> + android:layout_alignParentEnd="true"> + + <ImageView + android:id="@+id/subkey_item_edit_image" + android:src="@drawable/ic_action_edit" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" /> + + <ImageButton + android:id="@+id/subkey_item_delete_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:src="@drawable/ic_action_cancel" + style="@style/SelectableItem" /> + + </FrameLayout> <LinearLayout android:orientation="vertical" - android:layout_toRightOf="@id/ic_masterKey" - android:layout_toLeftOf="@id/user_id_item_edit_image" + android:layout_toLeftOf="@id/subkey_item_buttons" android:layout_centerVertical="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:id="@+id/linearLayout"> + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp"> <LinearLayout android:layout_width="match_parent" @@ -46,7 +49,7 @@ android:paddingTop="2dip"> <TextView - android:id="@+id/keyId" + android:id="@+id/subkey_item_key_id" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="0x00000000" @@ -55,7 +58,7 @@ android:layout_weight="1" /> <ImageView - android:id="@+id/ic_certifyKey" + android:id="@+id/subkey_item_ic_certify" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/certify_small" @@ -63,7 +66,7 @@ android:layout_gravity="center_vertical" /> <ImageView - android:id="@+id/ic_encryptKey" + android:id="@+id/subkey_item_ic_encrypt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/encrypted_small" @@ -71,7 +74,7 @@ android:layout_gravity="center_vertical" /> <ImageView - android:id="@+id/ic_signKey" + android:id="@+id/subkey_item_ic_sign" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/signed_small" @@ -79,7 +82,7 @@ android:layout_gravity="center_vertical" /> <ImageView - android:id="@+id/ic_revokedKey" + android:id="@+id/subkey_item_ic_revoked" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/revoked_key_small" @@ -94,7 +97,7 @@ android:layout_height="match_parent"> <TextView - android:id="@+id/keyDetails" + android:id="@+id/subkey_item_details" android:layout_width="0dp" android:layout_height="wrap_content" android:paddingRight="5dip" @@ -103,7 +106,7 @@ android:layout_weight="1" /> <TextView - android:id="@+id/keyExpiry" + android:id="@+id/subkey_item_expiry" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Expiry: 4/7/2016" |