diff options
Diffstat (limited to 'OpenKeychain/src/main')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_list_entry.xml | 102 |
1 files changed, 56 insertions, 46 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml index 7630e30d0..8f74e55fc 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml @@ -22,7 +22,6 @@ android:paddingRight="?android:attr/scrollbarSize" android:singleLine="true"> - <CheckBox android:id="@+id/selected" android:layout_width="wrap_content" @@ -33,37 +32,73 @@ <!-- focusable and clickable MUST be false to handle click and longClick in ListView Activity --> <LinearLayout - android:layout_width="0dip" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical" - android:paddingLeft="5dip" - android:paddingRight="5dip"> + android:orientation="vertical"> - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Alice" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:orientation="horizontal"> + + <LinearLayout + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + android:paddingRight="4dip"> + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Alice" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="alice@example.com" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="right" + android:orientation="vertical" + android:paddingLeft="4dp"> + + <TextView + android:id="@+id/status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="status" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#e00" /> + + <TextView + android:id="@+id/algorithm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="RSA" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_gravity="right" /> + </LinearLayout> + </LinearLayout> - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="alice@example.com" - android:textAppearance="?android:attr/textAppearanceSmall" /> <LinearLayout android:id="@+id/user_ids_list" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="36dip" + android:layout_height="match_parent" android:orientation="vertical" /> <TextView android:id="@+id/keyId" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="0xBBBBBBBBBBBBBBBB" android:textAppearance="?android:attr/textAppearanceSmall" @@ -71,36 +106,11 @@ <TextView android:id="@+id/fingerprint" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="0000 0000 0000 0000 0000\n0000 0000 0000 0000 0000" android:typeface="monospace" android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="right" - android:minWidth="90dip" - android:orientation="vertical" - android:paddingLeft="3dip"> - - <TextView - android:id="@+id/status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="status" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#e00" /> - - <TextView - android:id="@+id/algorithm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="RSA" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_gravity="right" /> - </LinearLayout> - </LinearLayout> |