diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-23 23:31:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-23 23:31:28 +0200 |
| commit | 76a1e99d7e30679722ffe2cb0c8c12b048adc369 (patch) | |
| tree | d488809449e0465d82f187f54d083b042ab930a8 /OpenKeychain/src/main/res/layout/key_list_item.xml | |
| parent | 214b60cd0049c90ea120401646c9d9ae707dc4ad (diff) | |
| parent | ecfa2288eb58c631900261270a99c8dcf27b4b4d (diff) | |
| download | open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.tar.gz open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.tar.bz2 open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/layout/key_list_item.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_item.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 7428d68e2..df69e4237 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -22,14 +22,14 @@ android:paddingBottom="4dp"> <TextView - android:id="@+id/mainUserId" + android:id="@+id/key_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/mainUserIdRest" + android:id="@+id/key_list_item_email" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" @@ -39,9 +39,9 @@ </LinearLayout> <LinearLayout - android:id="@+id/slinger_view" + android:id="@+id/key_list_item_slinger_view" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="?android:attr/listPreferredItemHeight" android:layout_gravity="center_vertical" android:orientation="horizontal"> @@ -54,18 +54,18 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/slinger_button" + android:id="@+id/key_list_item_slinger_button" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="center" android:src="@drawable/ic_action_safeslinger" - android:padding="16dp" + android:padding="12dp" style="@style/SelectableItem" /> </LinearLayout> <ImageView - android:id="@+id/status_icon" + android:id="@+id/key_list_item_status_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" |