aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java2
-rw-r--r--OpenKeychain/src/main/res/layout/keyspinner_item.xml10
-rw-r--r--OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml1
3 files changed, 6 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
index 616ea59b7..0b0fb0e04 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
@@ -189,7 +189,7 @@ public class MultiCertifyKeyFragment extends LoaderFragment
return new CursorLoader(mActivity, uri,
USER_IDS_PROJECTION, selection, ids,
Tables.USER_IDS + "." + UserIds.MASTER_KEY_ID + " ASC"
- + "," + Tables.USER_IDS + "." + UserIds.USER_ID + " ASC");
+ + ", " + Tables.USER_IDS + "." + UserIds.USER_ID + " ASC");
}
@Override
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index 411ceefdf..16a20542b 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -2,12 +2,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="24dp"
android:gravity="center_vertical"
android:singleLine="true"
android:orientation="horizontal"
android:descendantFocusability="blocksDescendants"
- android:focusable="false">
+ android:focusable="false"
+ android:minHeight="44dip">
<LinearLayout
android:layout_width="0dip"
@@ -18,8 +18,7 @@
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="4dp"
- android:paddingTop="4dp"
- android:paddingBottom="4dp">
+ >
<TextView
android:id="@+id/keyspinner_key_name"
@@ -53,6 +52,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout"
- android:padding="16dp" />
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"/>
</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
index c55be78fb..34727f989 100644
--- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
@@ -20,7 +20,6 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_certification_key" />