From 6e2b21b6b70c12995027f81acedb68c6069c5fb8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 6 Apr 2014 02:27:21 +0200
Subject: certs: fix CertifyKeyActivity and improve user id list

---
 OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml  | 5 +++--
 OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res')

diff --git a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
index 6cd140739..3fa0468de 100644
--- a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent" >
 
     <LinearLayout
@@ -114,7 +114,8 @@
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/user_ids"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:descendantFocusability="blocksDescendants" />
 
         <TextView
             style="@style/SectionHeader"
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
index aa14e6d2f..e47f591cb 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
@@ -9,7 +9,9 @@
     <CheckBox
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/checkBox" />
+        android:id="@+id/checkBox"
+        android:clickable="false"
+        android:focusable="false" />
 
     <TextView
         android:id="@+id/rank"
@@ -19,7 +21,8 @@
         android:text="0"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:width="30sp" />
 
     <LinearLayout
         android:orientation="vertical"
-- 
cgit v1.2.3