From 590650a3039ebabe820241bf8709569812aad7a8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 8 Oct 2014 15:36:18 +0200
Subject: [PATCH] remove ui hack, use padding instead of margin

---
 .../keychain/ui/MultiCertifyKeyFragment.java           | 10 ----------
 .../src/main/res/layout/multi_certify_key_fragment.xml |  7 +++----
 2 files changed, 3 insertions(+), 14 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 6a8dcbcec..ddfbac03c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
@@ -173,16 +173,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
             }
         });
 
-        // UI tidbit: "my key" is the area above the checkbox, if the user clicks there he
-        // probably actually wants to hit the checkbox
-        View vMyKeyLabel = view.findViewById(R.id.label_my_key);
-        vMyKeyLabel.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mUploadKeyCheckbox.performClick();
-            }
-        });
-
         return root;
     }
 
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 729a78545..d2335cbe9 100644
--- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
@@ -60,7 +60,6 @@
             android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/label_my_key"
                 android:paddingLeft="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -82,10 +81,10 @@
             android:id="@+id/sign_key_upload_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
             android:checked="false"
-            android:text="@string/label_send_key" />
+            android:text="@string/label_send_key"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"/>
 
         <View
             android:layout_width="match_parent"