From b6240f8927ea96ec69f4e88a4fb498535922e514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 18 Jan 2014 20:27:28 +0100
Subject: [PATCH] do not sign on update from server action

---
 .../res/layout/api_app_register_activity.xml           |  5 +++--
 .../res/layout/api_app_settings_activity.xml           |  9 +++++----
 .../res/layout/api_app_settings_fragment.xml           | 10 ++++++----
 .../keychain/ui/ViewKeyActivity.java                   |  4 ----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
index a6a2fbd31..2cbc81cf7 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -3,8 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    android:orientation="vertical" >
 
     <TextView
         android:id="@+id/api_register_text"
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index 0b83dd5cc..3dc8d5e84 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    android:orientation="vertical" >
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
index cecb2f93d..0695e5922 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
@@ -13,9 +13,10 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
             android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:paddingBottom="3dip" >
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/api_app_settings_app_icon"
@@ -50,7 +51,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_margin="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
             android:text="@string/api_settings_show_advanced"
             bootstrapbutton:bb_icon_left="fa-caret-up"
             bootstrapbutton:bb_size="default"
@@ -107,7 +109,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="com.example"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 90655ee46..2e934baa4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -372,10 +372,6 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements CreateN
             return;
         }
 
-        Intent signIntent = new Intent(this, SignKeyActivity.class);
-        signIntent.putExtra(SignKeyActivity.EXTRA_KEY_ID, updateKeyId);
-        startActivity(signIntent);
-
         Intent queryIntent = new Intent(this, KeyServerQueryActivity.class);
         queryIntent.setAction(KeyServerQueryActivity.ACTION_LOOK_UP_KEY_ID_AND_RETURN);
         queryIntent.putExtra(KeyServerQueryActivity.EXTRA_KEY_ID, updateKeyId);