From 9f9aa79066c48f2d4678c2d13893ea94b194032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 01:07:10 +0200
Subject: Fix conflicts

---
 .../keychain/ui/CreateKeyActivity.java             |  3 ++-
 .../main/res/layout/create_key_final_fragment.xml  | 25 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
index b49731739..569ae82f0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -68,7 +68,8 @@ public class CreateKeyActivity extends ActionBarActivity {
                 transaction.setCustomAnimations(R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right);
                 break;
             case ANIM_TO_RIGHT:
-                transaction.setCustomAnimations(R.anim.frag_slide_out_to_left, R.anim.frag_slide_in_from_right);
+                transaction.setCustomAnimations(R.anim.frag_slide_out_to_left, R.anim.frag_slide_in_from_right,
+                        R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right);
                 transaction.addToBackStack("back");
                 break;
 
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 57ba4ea75..4aa7c06b6 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -53,17 +53,38 @@
                 android:layout_height="wrap_content"
                 android:text="max@musterman.com"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginBottom="32dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginLeft="8dp" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
             <CheckBox
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/create_key_upload"
                 android:id="@+id/create_key_upload" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="8dp"
+                android:text="Creating the key can take up to 3 Minutes, be patient!"
+                android:textColor="@color/result_orange"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:id="@+id/textView" />
+
         </LinearLayout>
     </ScrollView>
 
@@ -91,7 +112,7 @@
             android:gravity="center_vertical"
             android:clickable="true"
             style="@style/SelectableItem"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical" />
 
         <View
             android:layout_width="1dp"
-- 
cgit v1.2.3