Merge branch 'master' into yubikey

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle

1 files changed, 31 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
new file mode 100644
index 000000000..703f9133b
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:padding="4dp"
+              android:layout_height="wrap_content">
+    <TextView android:id="@android:id/title"
+              android:textColor="?android:attr/textColorSecondary"
+              android:textSize="18sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"/>
+    <TextView android:id="@android:id/text1"
+              android:textColor="?android:attr/textColorTertiary"
+              android:textSize="14sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_marginTop="-4dip"/>
+    <TextView android:id="@android:id/text2"
+              android:textColor="?android:attr/textColorTertiary"
+              android:textSize="14sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_marginTop="-4dip"/>
+</LinearLayout>
\ No newline at end of file