From d75ea3f9e5b891e2dced2bb7cc0700c35f5bb7d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 4 Feb 2014 14:20:49 +0100
Subject: Certify not sign a key, added as button, does not belong to menu

---
 .../src/main/res/layout/certify_key_activity.xml   | 68 ++++++++++++++++++++++
 .../src/main/res/layout/sign_key_activity.xml      | 68 ----------------------
 .../src/main/res/layout/view_key_activity.xml      |  9 +++
 3 files changed, 77 insertions(+), 68 deletions(-)
 create mode 100644 OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
 delete mode 100644 OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml

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

diff --git a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
new file mode 100644
index 000000000..1dbd2476c
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical" >
+
+        <TextView
+            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_signing_key" />
+
+        <fragment
+            android:id="@+id/sign_key_select_key_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            tools:layout="@layout/select_secret_key_layout_fragment" />
+
+        <TextView
+            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_upload_key" />
+
+        <CheckBox
+            android:id="@+id/sign_key_upload_checkbox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:checked="false"
+            android:text="@string/label_send_key" />
+
+        <Spinner
+            android:id="@+id/sign_key_keyserver"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:enabled="false" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/sign_key_sign_button"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/btn_certify"
+            bootstrapbutton:bb_icon_left="fa-pencil"
+            bootstrapbutton:bb_type="info" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml
deleted file mode 100644
index 07f63b91b..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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_height="match_parent" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical" >
-
-        <TextView
-            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_signing_key" />
-
-        <fragment
-            android:id="@+id/sign_key_select_key_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            tools:layout="@layout/select_secret_key_layout_fragment" />
-
-        <TextView
-            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_upload_key" />
-
-        <CheckBox
-            android:id="@+id/sign_key_upload_checkbox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:checked="false"
-            android:text="@string/label_send_key" />
-
-        <Spinner
-            android:id="@+id/sign_key_keyserver"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:enabled="false" />
-
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/sign_key_sign_button"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/btn_sign"
-            bootstrapbutton:bb_icon_left="fa-pencil"
-            bootstrapbutton:bb_type="info" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
index 73a86a725..1c937430a 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
@@ -215,6 +215,15 @@
             android:text="@string/key_view_action_encrypt"
             bootstrapbutton:bb_icon_left="fa-lock"
             bootstrapbutton:bb_type="info" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/action_certify"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:padding="4dp"
+            android:text="@string/key_view_action_certify"
+            bootstrapbutton:bb_icon_left="fa-pencil"
+            bootstrapbutton:bb_type="info" />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3