From 05df0a63b71d00ad2beba57857c27f9ed50e30ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Nov 2015 18:09:41 +0100
Subject: Fix API 23 regression for activities without layout, see
 http://stackoverflow.com/q/32169303

---
 OpenKeychain/src/main/res/values/themes.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 38cf8a3db..fc6ae3846 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -85,11 +85,9 @@
         <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item>
     </style>
 
-    <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light">
-    </style>
+    <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"></style>
 
-    <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark">
-    </style>
+    <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"></style>
 
     <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
     <style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView">
@@ -134,4 +132,6 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
+
+    <style name="Theme.Keychain.Transparent" parent="@android:style/Theme.NoDisplay" />
 </resources>
-- 
cgit v1.2.3


From 8f070e24500616a78ed332fc7659e3d6b10860bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Nov 2015 19:15:00 +0100
Subject: Support for Android 6 ACTION_PROCESS_TEXT

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 123647bca..2e2e7a19e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -88,6 +88,7 @@
     <string name="btn_match_phrases">"Phrases match"</string>
     <string name="btn_share_encrypted_signed">"Encrypt/sign and share text"</string>
     <string name="btn_copy_encrypted_signed">"Encrypt/sign and copy text"</string>
+    <string name="btn_paste_encrypted_signed">"Encrypt/sign and paste text"</string>
     <string name="btn_view_cert_key">"View certification key"</string>
     <string name="btn_create_key">"Create key"</string>
     <string name="btn_add_files">"Add file(s)"</string>
-- 
cgit v1.2.3