Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain

1 files changed, 12 insertions, 11 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
index 9b92a373a..1141091a3 100644
--- a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="horizontal">
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/select_secret_key_select_key_button"
@@ -25,19 +25,10 @@
         android:layout_marginLeft="4dp"
         android:layout_marginTop="4dp"
         android:orientation="vertical"
-        android:paddingLeft="16dp" >
+        android:paddingLeft="4dp">
 
         <!-- Has been made focusable to display error messages with setError -->
         <TextView
-            android:id="@+id/select_secret_key_master_key_hex"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/api_settings_no_key"
-        />
-
-        <TextView
             android:id="@+id/select_secret_key_user_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,6 +38,7 @@
             android:focusableInTouchMode="true"
             android:singleLine="true"
             android:visibility="gone"
+            android:layout_marginRight="5dip"
             android:text=""
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -57,10 +49,19 @@
             android:layout_gravity="left"
             android:ellipsize="end"
             android:singleLine="true"
+            android:layout_marginRight="5dip"
             android:text=""
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
+        <TextView
+            android:id="@+id/select_secret_key_master_key_hex"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="@string/api_settings_no_key"
+            android:layout_marginRight="5dip" />
 
 
     </LinearLayout>